Add username to user

A user can now login with a username or email.

@houndci 
Align the elements of an array literal if they span more than one line.