Compat with Django 1.7

Fixes #17
Merge pull request #20 from mvasilkov/develop

Compat with Django 1.7