Change cleanup option for git commit

From 'whitespace' to 'strip'
Add and use colordiff
Merge branch 'master' of github.com:elim/dotfiles