Cleanup. Fixing callback error. Indention.
Removing un-needed future. Return whole user object.
Merge pull request #2 from patrickocoffeyo/master

Login Fixes, (username -> email), Cleanup, removing un-needed future, indention fixes