Merge branch 'release/1.0.0'
Config file selection with environment variable
Added deploy to Heroku guide
Merge branch 'master' into develop