Add username to user

A user can now login with a username or email.

@houndci 
Line is too long. [154/80]