Merge branch 'persona_resquash'

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

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

diff --cc mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
Simple merge