Changed devise setup so registration also takes username. Logging in can be done with username or email. Changed views to display username instead of email.