Resolve merge conflict and merge.

diff --cc mediagoblin/routing.py
index ad4aa18b2d5c77662946b422ee39c29249fc5fb2,5961f33b00fe7fc56f7460b1e1ff187f27f28070..daf8a45d216dfbd488ed52a4712b124ee6e93c9a
--- 1/mediagoblin/routing.py
--- 2/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@@ -36,6 -36,7 +36,10 @@@ def get_url_map()
      import mediagoblin.webfinger.routing
      import mediagoblin.listings.routing
      import mediagoblin.notifications.routing
++<<<<<<< HEAD
++=======
+     import mediagoblin.oauth.routing
++>>>>>>> e7b8059f17c98ee88d933af52b0c4d858e882e8e
      
      for route in PluginManager().get_routes():
          add_route(*route)

diff --cc mediagoblin/static/css/base.css
Simple merge

diff --cc mediagoblin/templates/mediagoblin/base.html
Simple merge

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