Add kdiff3NoAuto mergetool
Merge branch 'master' of github.com:makortel/dotfiles