Merge branch 'i507_beaker_cache'

diff --cc mediagoblin/app.py
Simple merge

diff --cc mediagoblin/config_spec.ini
Simple merge

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

diff --cc mediagoblin/mg_globals.py
Simple merge