More tweaks to database.yml