Fix mail unit tests
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet

Conflicts:
	django_fixmystreet/fixmystreet/tests/__init__.py
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet