Removed email field from add_devise_to_users because it was breaking.

Also removed duplicate fields from user.rb