Add cpp to the list of colors to highlight
Merge branch 'idiap' of github.com:anjos/dotfiles into idiap
Fix git config