Add opendiff as merge tool to gitconfig
Merge branch 'master' of github.com:cspickert/dotfiles