Merge branch 'master' of github.com:curipha/dotfiles
CVS is obsoleted
Normalize folding characters