Improve conformance to PEP8, tidy up.
Unify comment style
Merge pull request #156 from zas/pep8_plugins

Improve conformance to PEP8, tidy up.