add requirements file for pip users
cleanup and fixes
remove emails from settings.py
Merge branch 'master' into upgrade

Conflicts:
	accounts/views.py