Roll up #967 and #974

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

eos/__init__.py

@@ -1,8 +1,2 @@
 version = "0.2.3"
 tag = "git"
-
-
-def test():
-    import tests.runTests
-    import unittest
-    unittest.main(defaultTest="discover", testLoader=tests.runTests.loader)

eos/db/__init__.py

@@ -67,8 +67,8 @@ if saveddata_connectionstring is not None:
 sd_lock = threading.Lock()
 
 # Import all the definitions for all our database stuff
-from eos.db.gamedata import *
-from eos.db.saveddata import *
+from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
+from eos.db.saveddata import booster, cargo, character, crest, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, miscData, module, override, price, queries, skill, targetResists, user
 
 # Import queries
 from eos.db.gamedata.queries import *