Roll up #967 and #974

Takes the import fixes and cleanup out of those and rolls it into this
one

gui/builtinContextMenus/moduleGlobalAmmoPicker.py

@@ -3,7 +3,7 @@ import gui.mainFrame
 import wx
 import gui.globalEvents as GE
 from gui.builtinContextMenus.moduleAmmoPicker import ModuleAmmoPicker
-import eos.db
+from eos.db.saveddata.queries import getFit as db_getFit
 from service.fit import Fit
 
 
@@ -26,7 +26,7 @@ class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
 
         sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
-        fit = eos.db.getFit(fitID)
+        fit = db_getFit(fitID)
 
         selectedModule = self.modules[0]
         allModules = []