Add username to user

A user can now login with a username or email.

@houndci 
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.