Colored word diff
Merge branch 'master' of github.com:muff1nman/gitconfigs