Use newer nginx
Merge branch 'staging' and don't deploy on production for now
Add Procfile, no dyno's are started by default