Adding new settings.
Merge branch 'master' of github.com:narrowfail/django-quickstart