Merge remote branch 'remotes/gullydwarf-cfdv/b404_v2_redirect_after_profile_edit'

Conflicts:
	mediagoblin/edit/views.py

diff --cc mediagoblin/edit/views.py
index e064a9c3083c287eb4a5ec4872718286bdcd79e2,5cfe904e224f6912859058087e1afb14f7acccb5..a3326b2d7dc62c2fd7bc03e3c1737b2013eccdf5
--- 1/mediagoblin/edit/views.py
--- 2/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@@ -106,9 -87,9 +106,9 @@@ def edit_profile(request)
              messages.add_message(request, 
                                 messages.SUCCESS, 
                                 'Profile edited!')
-             return redirect(request, 
-                          "mediagoblin.edit.profile", 
+             return redirect(request,
+                            'mediagoblin.user_pages.user_home',
 -                            user=user['username'])
 +                          username=edit_username)
  
      return render_to_response(
          request,