Refine login more
Merge remote-tracking branch 'origin/master' into heroku
Deploy Mon Oct 13 10:45:29 CDT 2014