Rationalise Heroku config

Hi Tom, A more contained pull request, though not nearly as impressive in terms of number of files changed.