Merge branch 'merge-python3-port'

Conflicts:
	setup.py

diff --cc mediagoblin/app.py
Simple merge

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

diff --cc mediagoblin/gmg_commands/users.py
index d34f50e2d395007bf621eddcfdf6c607522dd558,93b72ea438dd2521c5dc2786852f72eeeab992e8..63c48690efbb956a46e90c7c7bb15e47921d4577
--- 1/mediagoblin/gmg_commands/users.py
--- 2/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@@ -129,9 -133,9 +133,9 @@@ def deleteuser(args)
      db = mg_globals.database
  
      user = db.User.query.filter_by(
 -        username=unicode(args.username.lower())).one()
 +        username=unicode(args.username.lower())).first()
      if user:
          user.delete()
-         print 'The user %s has been deleted' % args.username
+         print('The user %s has been deleted' % args.username)
      else:
-         print 'The user %s doesn\'t exist' % args.username
+         print('The user %s doesn\'t exist' % args.username)

diff --cc mediagoblin/init/celery/__init__.py
Simple merge

diff --cc mediagoblin/tools/response.py
Simple merge

diff --cc setup.py
index 327221d28678acc023dea4eb14c2506245b5f77c,e1c3c6188f22ae0fbfe07410c5c3e68d69ce8aa6..a644a3c3f57ec0129832fc4c17cbd6b3bf1dcfe7
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -113,7 -125,8 +125,7 @@@ try
      author='Free Software Foundation and contributors',
      author_email='cwebber@gnu.org',
      url="http://mediagoblin.org/",
-     long_description=open(READMEFILE).read(),
 -    download_url="http://mediagoblin.org/download/",
+     long_description=long_description,
      description='MediaGoblin is a web application for publishing all kinds of media',
      classifiers=[
          "Development Status :: 3 - Alpha",