Merge remote-tracking branch 'refs/remotes/rodney757/email'

diff --cc mediagoblin/edit/forms.py
index 5de1bf96ec98d198fa2eed1c5e7b5feca2840561,71f305208c3a5f6a8b6da676d2311fa4dd4f162a..3f1e2386a97a466acb6017aeee5d5b28f5934c40
--- 1/mediagoblin/edit/forms.py
--- 2/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@@ -61,14 -61,8 +61,10 @@@ class EditProfileForm(wtforms.Form)
  
  
  class EditAccountForm(wtforms.Form):
-     new_email = wtforms.TextField(
-         _('New email address'),
-         [wtforms.validators.Optional(),
-          normalize_user_or_email_field(allow_user=False)])
      wants_comment_notification = wtforms.BooleanField(
          description=_("Email me when others comment on my media"))
 +    wants_notifications = wtforms.BooleanField(
 +        description=_("Enable/Disable insite notifications"))
      license_preference = wtforms.SelectField(
          _('License preference'),
          [

diff --cc mediagoblin/edit/views.py
Simple merge