Remove config template as it only had config vars that now exist as env variables on heroku/godaddy
Merge remote-tracking branch 'origin/master'