Change the path to clang-format to ~/bin/clang-format
Merge remote-tracking branch 'origin/master'