Fix more typos.  Reindent one bit of example code.
Fix a typo in the last fix.
Merge remote-tracking branch 'upstream/master'
Changes to code: spaces around operators and spaces between parameters.
Also, reindented some code that didn't use 4 space indentation.
Merge remote-tracking branch 'upstream/master'
Fix some more indentation, etc.
Merge pull request #400 from VictorNorman/master

More typos fixed.