Django 1.7.1
Merge pull request #1 from ccnmtl/django-1.7.1

Django 1.7.1