add diff_highlight
Merge branch 'master' of github.com:abish/dotfiles