Add username to user

A user can now login with a username or email.

@houndci 
Align the parameters of a method call if they span more than one line.<br>Use the new Ruby 1.9 hash syntax.