pep8 fixes
and fixed most of the long lines
questionable fix of overly long import lines
Merge pull request #2030 from tacaswell/image_pep8

Image pep8