dotfiles/orb merge conflict.
Also only setup clang-format entirely on osx for now until I compile 3.4 for linux manually.