I accidentally pushed some of my own changes - I've cleaned up the mess, but as a result several of my clang-format changes had to get re-uploaded under new differential IDs in order to allow review. Sorry for the mess folks.