Merge branch 'gullydwarf-cfdv-f357_lost_password_functionality'

Conflicts:
	mediagoblin/auth/routing.py

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

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

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

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

diff --cc mediagoblin/db/migrations.py
Simple merge

diff --cc mediagoblin/db/models.py
Simple merge

diff --cc mediagoblin/templates/mediagoblin/auth/login.html
Simple merge

diff --cc mediagoblin/tests/test_auth.py
Simple merge