Update settings.py and urls.py to match current master