Add conditional support for django 1.7
Merge pull request #1 from brightinteractive/django-1.7

Add conditional support for django 1.7