Merge remote-tracking branch 'joar-github/oauth/refresh_tokens'

This merges the patch for Issue #548.

diff --cc mediagoblin/tests/tools.py
index a0498a6eb89806913ea554d7bb9cac8520ad563a,b68d55e81a44af2e8f491da1f737fe415ebf75c2..52635e18f699a6b25cf2a696890b94af07aeb2ee
--- 1/mediagoblin/tests/tools.py
--- 2/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@@ -50,7 -52,8 +50,9 @@@ USER_DEV_DIRECTORIES_TO_SETUP = ['media
  BAD_CELERY_MESSAGE = """\
  Sorry, you *absolutely* must run tests with the
  mediagoblin.init.celery.from_tests module.  Like so:
- $ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests ./bin/py.test"""
 -$ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests {0}\
++
++$ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests {0}
+ """.format(sys.argv[0])
  
  
  class BadCeleryEnviron(Exception): pass