clean up conf files
Merge branch 'master' of https://github.com/drewbrns/django-template