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

Conflicts:
	mediagoblin/auth/views.py
	mediagoblin/edit/forms.py
	mediagoblin/templates/mediagoblin/edit/edit_account.html

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

diff --cc mediagoblin/edit/forms.py
index 388940b42655834c1babdd6bf89e7c81bd55f8fc,30dce1510cadceab4c0a984223987ca69844c1bc..0832f0dbd9b627b6bd1fea1926d406ac8aa3e426
--- 1/mediagoblin/edit/forms.py
--- 2/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@@ -81,6 -83,6 +81,7 @@@ class EditAttachmentsForm(wtforms.Form)
      attachment_file = wtforms.FileField(
          'File')
  
++
  class EditCollectionForm(wtforms.Form):
      title = wtforms.TextField(
          _('Title'),

diff --cc mediagoblin/edit/routing.py
index 75f5a6d8b48f6ed23c149c398a0419a89e6a32b1,e6264fb6a17a4f94ec973f3d80f72677e3998c18..a2d03d2683b1dd76519a1aa053c174517140106c
--- 1/mediagoblin/edit/routing.py
--- 2/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@@ -24,9 -24,5 +24,7 @@@ add_route('mediagoblin.edit.account', '
      'mediagoblin.edit.views:edit_account')
  add_route('mediagoblin.edit.delete_account', '/edit/account/delete/',
      'mediagoblin.edit.views:delete_account')
- add_route('mediagoblin.edit.pass', '/edit/password/',
-     'mediagoblin.edit.views:change_pass')
  add_route('mediagoblin.edit.verify_email', '/edit/verify_email/',
      'mediagoblin.edit.views:verify_email')
 +add_route('mediagoblin.edit.email', '/edit/email/',
 +    'mediagoblin.edit.views:change_email')

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

diff --cc mediagoblin/templates/mediagoblin/edit/edit_account.html
Simple merge

diff --cc mediagoblin/tests/test_edit.py
Simple merge