Trying to eliminate a step for local settings...
Merge branch 'master' of github.com:dansackett/django_template