removed cached database.yml
Merge branch 'master' of github.com:brittlewis12/batman
fixed local issue with database.yml