Merge pull request #2971 from ctiller/wtf-happened-to-our-formatting

clang-format all source