make changes to .gitignore around database.yml
Merge branch 'master' of github.com:gangplank/CityIdeas