Fix more trivial typos
Merge pull request #664 from jthackray/master

Fix more trivial typos