Whitespace fixes
Merge pull request #214 from GrahamCampbell/tweaks

Whitespace Fixes
Closes #221
Merge branch '1.2' into 2.0
Merge branch '2.0'