Settings to deploy to heroku
Merge branch 'heroku'