Rolled back database.yml to use proper dev database credentials
Merge branch 'master' of github.com:Pitt-CSC/handy

Conflicts:
	config/database.yml