PEP8 changes, mostly whitespace

I would recommend merging #9 and #10 prior to merging this.