Revert "Merge branch 'master' into wx3"

This reverts commit 33a0c10650, reversing
changes made to 2077655694.

Reverting merges fucks up git, but oh well - we probably better merge stuff manually rather than fucking up master with wx3 which is apparently buggy

pyfa.py

@@ -20,7 +20,6 @@
 
 import sys
 import re
-import config
 
 if not hasattr(sys, 'frozen'):
 
@@ -31,27 +30,18 @@ if not hasattr(sys, 'frozen'):
     try:
         import wxversion
     except ImportError:
-        print("Cannot find wxPython\nYou can download wxPython (2.8+) from http://www.wxpython.org/")
+        print("Cannot find wxPython\nYou can download wxPython (2.8) from http://www.wxpython.org/")
         sys.exit(1)
-    
-    # if user wants to force 2.8, try that and go directly to ensureMinimal path if fails
     try:
-        if getattr(config.configforced, "force28", False):
-            wxversion.select('2.8')
-        else:
-            # try 3.0, then 2.8. If any exceptions, go to ensureMinimal path
-            try:
-                wxversion.select('3.0')
-            except:
-                wxversion.select('2.9')
+        wxversion.select('2.8')
     except wxversion.VersionError:
         try:
             wxversion.ensureMinimal('2.8')
         except wxversion.VersionError:
-            print "Installed wxPython version doesn't meet requirements.\nYou can download wxPython (2.8+) from http://www.wxpython.org/"
+            print("Installed wxPython version doesn't meet requirements.\nYou can download wxPython (2.8) from http://www.wxpython.org/")
             sys.exit(1)
         else:
-            print "wxPython 2.8 not found; attempting to use newer version, expect errors"        
+            print("wxPython 2.8 not found; attempting to use newer version, expect errors")
 
     try:
         import sqlalchemy
@@ -82,6 +72,7 @@ if __name__ == "__main__":
     parser.add_option("-r", "--root", action="store_true", dest="rootsavedata", help="if you want pyfa to store its data in root folder, use this option", default=False)
     (options, args) = parser.parse_args()
 
+    import config
     # Configure paths
     if options.rootsavedata is True:
         config.saveInRoot = True