Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

diff --cc mediagoblin/media_types/image/__init__.py
Simple merge

diff --cc mediagoblin/processing/__init__.py
Simple merge

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

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