@thijstriemstra fixed a number of typos in the docs. closes #1704
Merge remote-tracking branch 'upstream/master'