Updated configs for heroku deployment
Merge branch 'heroku-master'