Unicorn server and 12Factor for Heroku use
Merge branch 'feature/heroku-prepare'