manually merging changes from Heroku version of app into self hosted version