Running through clang-format for consistency. Moving to Linux-esque brace style.
Authored by: m0slevin 2016-07-28
Parent: [r366]
Child: [r368]