modified email settings
Merge branch 'vinny' of github.com:zhiweihu/pencilme-dev into vinny

Conflicts:
	pencilme/pencilme/settings/local.py