Added username attribute to users and changed devise forms