Django 1.7 support
Merge pull request #1 from magicjohnson/master

Django 1.7 support