Merge branch 'master' into bump-version

Author: Matthew Fisher

rootfs/deis/gunicorn/config.py

@@ -10,7 +10,7 @@
     if workers < 1:
         raise ValueError()
 except (NameError, ValueError):
-    workers = (os.cpu_count() or 4) * 2 + 1
+    workers = (os.cpu_count() or 4) * 4 + 1
 
 pythonpath = dirname(dirname(dirname(realpath(__file__))))
 timeout = 1200

rootfs/requirements.txt

@@ -8,7 +8,7 @@ docker-py==1.8.1
 gunicorn==19.6.0
 jsonfield==1.0.3
 morph==0.1.2
-ndg-httpsclient==0.4.0
+ndg-httpsclient==0.4.1
 psycopg2==2.6.1
 pyOpenSSL==16.0.0
 pytz==2016.4