Update formatting

We use a non-standard 2-space indent, so updating back to that.
Re-indent files

Update files to use 2-space indent
Refactor

Sorry for the mega-commit, this is a cleanup across the code-base,
trying to get the style consistent.
Update contributing guide
Update README.md
Bump for next release
Fix nuspec file

So it turns out our nuspec was broken, and we didn't know it...