Xdefaults: Adjust colours.
zshrc: Switch to using colordiff.
Merge branch 'master' of github.com:Smattr/mattutils