Use clang-format
Merge branch 'master' of github.com:osbolab/dotfiles
Remove snippets, add surround