Merge "Add 100 column limit to .clang-format."