Revert "Make local settings optional"

This reverts commit 6483eda64607f0dacefb949056a01698f7d6f051.

Conflicts:
	manage.py