Refactored some Heroku specific settings.
Changed the default settings to always be local settings.