Do not use meld, and redirect errors to /dev/null
Merge branch 'master' of github.com:aawc/dotfiles