Further PEP8 changes.
Merge pull request #25 from tomwallis/master

Further PEP8 changes.