Updated the user controller to use either email address or username for the login. Also made the change to the views so they reflect the changes.