Merge remote-tracking branch 'remotes/nyergler/pep8-ification'

Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/user_pages/views.py
	mediagoblin/util.py

mediagoblin/listings/routing.py

@@ -25,4 +25,3 @@ tag_routes = [
     Route('mediagoblin.listings.tag_atom_feed', "/{tag}/atom/",
         controller="mediagoblin.listings.views:tag_atom_feed"),
     ]
-    

mediagoblin/listings/views.py

@@ -47,7 +47,7 @@ def tag_listing(request, page):
         {u'state': u'processed',
          u'tags.slug': tag_slug})
     cursor = cursor.sort('created', DESCENDING)
-         
+
     pagination = Pagination(page, cursor)
     media_entries = pagination()
 
@@ -64,6 +64,7 @@ def tag_listing(request, page):
 
 ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 15
 
+
 def tag_atom_feed(request):
     """
     generates the atom feed with the tag images