adds Django 1.7 support
Merge pull request #23 from mrc75/patch-3

Django 1.7 support