almost final changes to database.yml