Include fixed info for deploying on Heroku including the issue with
.gitignore and config/secrets.json
Merge branch 'master' into switachable-template-support