Remove secrets from database.yml and add the config file for deployment
Merge in Jaco's formally conflicting changes