Merge with heroku config vars