Small fixes and config tweaks.
Simplify gunicorn.sh
Merge from origin/master.