Remove all trailing whitespace
Clean up to placate flake8
Merge pull request #2 from funkybob/tidy-up

Tidy up