Django 1.7 support
Merge pull request #45 from danmac-uk/master

Django 1.7 support