using meld as difftool
Merge branch 'master' of https://github.com/krisgry/Config