OSX no longer needs host: localhost in database.yml if you export PG_HOST=localhost in .bash_profile
merging minor db change and slight refactoring on user controller