Add compatibility with Django versions prior to 1.5
Change import names
Merge pull request #86 from lstaniszewski/master

Add compatibility with Django versions prior to 1.5