Merge branch 'master' of github.com:rhysd/vim-clang-format