Various spelling and style changes
Merge branch 'patch-2' of https://github.com/svisser/PyHAML into patch-2