Add username to user

A user can now login with a username or email.

@houndci 
Line is too long. [120/80]<br>Use the new Ruby 1.9 hash syntax.