Revert "updating database.yml"

This reverts commit 524bc7136c801e66370ea4f797e0a385cd9b7b5f.
Merge branch 'master' of cumuseum.colorado.edu:/data/web/rails_beesneeds

Conflicts:
	.gitignore
	config/database.yml
Merge branch 'master' of /Users/joshfermin/Dropbox/Projects/rails_beesneeds
modifying config/database.yml