Fix imports for django 1.6
Merge pull request #1 from rlr/django16

Fix imports for django 1.6