Update deprecated imports with Django >= 1.7

Fixes a couple of PendingDeprecationWarning with Django 1.7