first cut running
Merge branch 'django-config'