Fix typos
Merge pull request #964 from jordansissel/fix-typos

Fix typos