@@ -1,13 +1,13 @@

 Flask==0.10.1

-Flask-Cors==2.1.0

-Flask-Limiter==0.8.5

+Flask-Cors==2.1.2

+Flask-Limiter==0.9.1

 Flask-Login==0.3.2

 Flask-OAuth==0.12

-Flask-Security==1.7.4

+Flask-Security==1.7.5

 Flask-WTF==0.12

-lxml==3.4.4

+lxml==3.5.0

 psycopg2==2.6.1

 python-dateutil==2.4.2

 requests==2.8.1

-textblob==0.10.0

+textblob==0.11.0

 uWSGI==2.0.11.2

@@ -19,9 +19,11 @@ except ImportError:

         secret_key = base64.b64encode(os.urandom(24))

         debug = False

         static_root =  os.path.join(os.path.dirname(__file__), os.path.pardir, 'static')

+        server_name = "localhost"

 app.secret_key = config.secret_key

 app.debug = config.debug

+app.config["SERVER_NAME"] = config.server_name

 limiter = Limiter(app)

 limiter.limit("60/hour 3/second", key_func=lambda: request.host)(user.user_blueprint)

@@ -1,21 +1,24 @@

 from flask import g

 import psycopg2

+

 try: from marrow_config import config

 except ImportError:

     class config:

-        db = "marrow"

-        user = "marrow"

-        password = "marrowpass"

-        host = "pgsqlserver.elangley.org"

+        class db:

+            db = "marrow"

+            user = "marrow"

+            password = "marrowpass"

+            host = "pgsqlserver.elangley.org"

 def get_db(close=True):

     db = getattr(g, '_database', None)

+    _config = config.db

     if db is None:

         db = g._database = [psycopg2.connect(

-          database=config.db,

-          user=config.user,

-          password=config.password,

-          host=config.host

+          database=_config.db,

+          user=_config.user,

+          password=_config.password,

+          host=_config.host

         ),close];

     return db[0]