Sync with 2014-11-05 templates

https://github.com/jwhitlock/cookiecutter-django-jw/commit/73d45ff390ae904de290f31befceb90c61797c24