Using 4 space indentation
Merge branch 'master' of github.com:dustinfarris/django-skeleton