change database.yml file
make name consistent
Merge branch 'master' into init_setup
Merge pull request #3 from pmmenzel/init_setup

Init setup