Update DEFAULT_FROM_EMAIL and SERVER_EMAIL
Merge branch 'master' into django-fluent