Pull changes and resolve merge conflict.

diff --cc mediagoblin/media_types/image/__init__.py
index 380304e6456ee93b23e9c4ef06cdb72291e251be,06e0f08f888dd0bfab895a8101cae0bb001b4557..f5b49f018ee82096390cd629b43776d666a48c0a
--- 1/mediagoblin/media_types/image/__init__.py
--- 2/mediagoblin/media_types/image/__init__.py
+++ b/mediagoblin/media_types/image/__init__.py
@@@ -27,11 -27,7 +27,9 @@@ _log = logging.getLogger(__name__
  ACCEPTED_EXTENSIONS = ["jpg", "jpeg", "png", "gif", "tiff"]
  MEDIA_TYPE = 'mediagoblin.media_types.image'
  
- 
 +def setup_plugin():
 +    config = pluginapi.get_config(MEDIA_TYPE)
  
- 
  class ImageMediaManager(MediaManagerBase):
      human_readable = "Image"
      display_template = "mediagoblin/media_displays/image.html"