Move more settings into environment config.
Fix for weird Heroku-only bug.
Merge branch 'master' into develop

* master:
  Fix for weird Heroku-only bug.
  Move more settings into environment config.