Consolidate settings: try heroku first, fall back to localhost
Merge pull request #91 from OAButton/feature/local-heroku-settings

Consolidate settings: try heroku first, fall back to localhost