Fix typos and spelling
Merge pull request #2629 from cbilson/dev

Fix typos and spelling