Django 1.7
Merge pull request #2 from ccnmtl/django-1.7.1

Django 1.7

self-merging