PEP8 changes, mostly whitespace

Be sure to merge this *AFTER* merging #13.