Merge pull request #17 from cmu-delphi/development

Merge latest from development and deploy to staging

Author: korlaxxalrok

gunicorn/gunicorn.py

@@ -2,3 +2,5 @@
 
 bind = "0.0.0.0:8000"
 workers = multiprocessing.cpu_count() * 2 + 1
+keepalive = 120
+timeout = 300

nginx/default.conf.template

@@ -18,5 +18,11 @@ server {
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 300;
+        proxy_connect_timeout 300;
+        proxy_send_timeout 300;
+        send_timeout 300;
+        keepalive_timeout 300;
+        client_max_body_size 64m;
     }
 }