settings.py
Fixed settings so that os comes before template
moved around things in settings.py
fixing settings.py until it works
fix for merge