Modified config.js so that the security credentials are read from the
process' environment (configured via heroku config)
Merge from master
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Minor fix to the design
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge from master
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku