django 1.8 compat
Merge pull request #2 from davidszotten/dj18

django 1.8 compat