Use 4 space indentation in C++.
Merge branch 'master' of github.com:mblondel/dotfiles