Cleaned up some settings in settings.py
Merge remote-tracking branch 'origin/master'