Merge remote-tracking branch 'setup/feature/setuptools-integration'

cps/ub.py

@@ -30,7 +30,7 @@ from werkzeug.security import generate_password_hash
 import json
 import datetime
 from binascii import hexlify
-import cli
+from cps import cli
 
 engine = create_engine('sqlite:///{0}'.format(cli.settingspath), echo=False)
 Base = declarative_base()

cps/web.py

@@ -112,7 +112,7 @@ try:
     from natsort import natsorted as sort
 except ImportError:
     sort=sorted # Just use regular sort then
-                #   may cause issues with badly named pages in cbz/cbr files
+                # may cause issues with badly named pages in cbz/cbr files
 try:
     import cPickle
 except ImportError: