updated settings.py.example to include email blacklist
Merge branch 'master' into afro