login with username or email
Merge pull request #2 from trenchwarfare/usernames_and_emails

login with username or email