change database.yml file
make name consistent
Merge branch 'master' into init_setup