Add Django 1.7 support
Merge pull request #34 from stefanw/django1.7

Add Django 1.7 support