Added username field to users, got rid of redundant devise user model