Revert "Revert "Make work with Django 1.7""

This reverts commit 67d3967a4b81a270cda4f9aa193239589247fa70.