Fixing username and allowing to login w/ username
Merge pull request #2 from jclay/username_fix

Fixing username and allowing to login w/ username