Fixed Django settings
Merge branch 'master' of https://github.com/isibner/zimbabwe-debate