indent to two spaces

This patch contains only whitespace changes, plus a short
addition to CONTRIBUTING.md on the project-wide indent style
Merge pull request #2546 from rolandwalker/indenting

indent to two spaces