Merge branch 'master' of github.com:themalkolm/dotfiles
Merge branch 'master' of github.com:themalkolm/dotfiles
use colordiff