adding master settings.py back in in case merge issues