updated controller and views to allow for login with either email or username and signup with email additionally.
added login with email test
Merge pull request #37 from raccoons-2014/login-email-un

All good. Merged.