PEP8 clean up to import changes for forward compatibility with Django 1.5+

If I was smarter and less tired I would have worked from a branch and this would have been cleaner, but here it is cleaned up.