Merge branch 'master' of https://github.com/masscut/dotfiles
add colordiff config