Massive indentation rework. AGAIN.
Merge remote-tracking branch 'remotes/origin/master' into WhitespaceBomination
Merge pull request #134 from fake-name/WhitespaceBomination

Whitespace rework to produce consistent layout using 4-space indentation. Copy of #132