Added username to users and admins; including username in corresponding devise files