Typo fixes in comments

Signed-off-by: Kartik Mistry <kartik.mistry@gmail.com>
Merge branch 'master' into pr/586