adding 12 factor back in
Merge branch 'master' of heroku.com:safe-shore-8760