Update settings.py

And delete moved settings from settings-dev.py.