merged manage.py, not debugged yet
created condensed version of settings.py to make merging easier