Sort imports for pep8

A few tweaks for pep8 since the pep8 tox target is failing with a number of warnings