Fix broken imports for Django 1.6
Merge pull request #78 from mrmachine/master

Fix broken imports for Django 1.6