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

Conflicts:
	accounts/views.py
Formatted config file, and removed old entries

Conflicts:
	djnro/settings.py.dist
Merge branch 'upgrade' into uninett

Conflicts:
	djnro/settings.py.dist