diff --git a/.gitignore b/.gitignore
index 854a5a5fb..beed9c400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
 venv
+.elasticbeanstalk/
diff --git a/wsgi.py b/application.py
similarity index 70%
rename from wsgi.py
rename to application.py
index b598e2fc6..c4e4f602e 100644
--- a/wsgi.py
+++ b/application.py
@@ -1,6 +1,6 @@
 import logging
 
-from app import app
+from app import app as application
 
 import endpoints.index
 import endpoints.api
@@ -8,9 +8,12 @@ import endpoints.web
 import endpoints.tags
 import endpoints.registry
 
+# Remove this for prod config
+application.debug = True
+
 if __name__ == '__main__':
   FORMAT = '%(asctime)-15s - %(levelname)s - %(pathname)s - ' + \
            '%(funcName)s - %(message)s'
   logging.basicConfig(format=FORMAT, level=logging.DEBUG)
 
-  app.run(port=5001, debug=True)
+  application.run(port=5001, debug=True)
diff --git a/endpoints/registry.py b/endpoints/registry.py
index 2cad43ee8..42aebf19e 100644
--- a/endpoints/registry.py
+++ b/endpoints/registry.py
@@ -1,8 +1,8 @@
 
 import logging
+import json
 
 from flask import make_response, request, session, Response, abort
-import simplejson as json
 from functools import wraps
 from datetime import datetime
 from time import time
diff --git a/endpoints/tags.py b/endpoints/tags.py
index 46d64a985..b9b331c7f 100644
--- a/endpoints/tags.py
+++ b/endpoints/tags.py
@@ -1,8 +1,8 @@
 
 import logging
+import json
 
 from flask import abort, request, jsonify, make_response
-import simplejson as json
 
 import storage
 
diff --git a/requirements-nover.txt b/requirements-nover.txt
new file mode 100644
index 000000000..7cdb7d4b6
--- /dev/null
+++ b/requirements-nover.txt
@@ -0,0 +1,8 @@
+peewee
+flask
+py-bcrypt
+Flask-Principal
+Flask-Login
+Flask-Mail
+python-dateutil
+boto
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 560d03df5..2c28e828a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,17 @@
-peewee
-flask
-py-bcrypt
-Flask-Principal
-Flask-Login
-Flask-Mail
\ No newline at end of file
+Flask==0.10.1
+Flask-Login==0.2.7
+Flask-Mail==0.9.0
+Flask-Principal==0.4.0
+Jinja2==2.7.1
+MarkupSafe==0.18
+Werkzeug==0.9.4
+argparse==1.2.1
+blinker==1.3
+boto==2.13.3
+distribute==0.6.34
+itsdangerous==0.23
+peewee==2.1.4
+py-bcrypt==0.4
+python-dateutil==2.1
+six==1.4.1
+wsgiref==0.1.2