Add username to user

A user can now login with a username or email.

@houndci 
Could the above three lines be one line?