Fix import for newer versions of Django
Merge pull request #1 from onespacemedia/master

Fix import for newer versions of Django
Merge pull request #1 from etianen/master

latest from Dave