First set of changes from Jon Forrest. Chap 3 is only partly done.
Merge branch 'master' of https://github.com/nobozo/progit