Fix imports that are incompatible with Django 1.6
Merge pull request #3 from fmr/fix/django_1_6

Fix imports that are incompatible with Django 1.6