Fix imports for django 1.6

We are using your fork. Should we switch?

Anyway r?