Merge branch 'master' of github.com:ZeusWPI/Foodbot

Conflicts:
	app/app.py
	app/james.py

.gitignore

@@ -60,3 +60,5 @@ app/config.py
 
 # Do not add db file
 *.db
+
+tmp/

app/james.py

@@ -10,4 +10,4 @@ from utils import *
 from views import *
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0')
+    app.run()

app/passenger_wsgi.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+import sys
+import os
+
+INTERP = os.path.expanduser("~/env/bin/python")
+if sys.executable != INTERP:
+    os.execl(INTERP, INTERP, *sys.argv)
+
+sys.path.append(os.getcwd())
+
+from james import app as application

app/wsgi.py

@@ -1,4 +0,0 @@
-from app import app
-
-if __name__ == "__main__":
-    app.run()

uwsgi.ini

@@ -1,23 +0,0 @@
-# mysite_uwsgi.ini file
-[uwsgi]
-
-# Django-related settings
-# the base directory (full path)
-chdir           = /home/james/production
-# Callables
-module          = app
-callable        = app
-# the virtualenv (full path)
-virtualenv      = /home/james/production/env
-
-# process-related settings
-# master
-master          = true
-# maximum number of worker processes
-processes       = 1
-# the socket (use the full path to be safe
-socket          = /tmp/james.sock
-# ... with appropriate permissions - may be needed
-chmod-socket    = 664
-# clear environment on exit
-vacuum          = true