Made it django 1.6 compatible,
Merge pull request #1 from marky1991/master

Made it django 1.6 compatible.