Fix login to key off the right database column
Merge remote-tracking branch 'origin/master' into heroku
Deploy Mon Oct 13 11:03:37 CDT 2014