Point to heroku profile
Merge branch 'master' into heroku
Cheanged config