Make pep8 pass on pep8 1.5.6
More pep8 fixes
More pep8 fixes
Resolved merge conflicts
More pep8 fixes - 125 left
PEP8 v 1.5.6 fixes - no more pep8 violations.
Resolved merge conflict
Merge pull request #1346 from timlinux/pep8-1.5.6

Pep8 1.5.6