Add username to user

A user can now login with a username or email.

@houndci 
User <br> instead of <br /> -Steiner