Merge branch 'master' into video

ikreymer · ikreymer · commit 3819e935fbcd · 2014-12-23T13:43:20.000-08:00
diff --git a/run-gunicorn.sh b/run-gunicorn.sh
@@ -2,7 +2,7 @@
 pip install gunicorn
 
 if [ $? -ne 0 ]; then
-    "uwsgi install failed"
+    "gunicorn install failed"
     exit 1
 fi
 
