Added back default database.yml
Moved original database.yml out of the way