Very minor style fixes

Replacing tabs with spaces consistently, making brace styles consistent, etc.
Merge pull request #280 from mc10/patch-1

Very minor style fixes