Merge pull request #111 from bobjansen/master

PEP8 fixes for Chapter 2