finishing up bootstrap script
Merge branch 'master' of https://github.com/Lightmatter/generic-django-conf