Allow django 1.7
Merge pull request #51 from jieter/master

Allow django 1.7