Add dj- templates
Add dj- templates
Merge branch 'master' of git://github.com/pydanny/cookiecutter into pydanny-master