Fix for Django 1.7
Merge pull request #22 from raspberrywhite/fixdjango1.7

Fix for Django 1.7