Update deprecated imports with Django >= 1.7
Merge pull request #283 from amarandon/master

Update deprecated imports with Django >= 1.7