allow user to login with email or username
see #3
Merge pull request #8 from aaronmallen/fix/03-username_or_email

03-username_or_email