Fix formatting nightmare

The broken window effect?

- Restored 2 space indents (gtfo bizarro 3 space indents)
- Fix statement head curly braces, because they were all over the place

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
I do these things just so Rick will talk to me.
Merge branch 'rwaldron-fix-formatting'