fixes #6
Merge branch 'master' of github.com:uhuramedia/cookiecutter-django