Various updates.
Merge branch 'master' of https://github.com/ecrampton/dotfiles
Shell script for using git diff with meld.