Adding options for mergetool
Merge branch 'master' of github.com:renatocf/dotfiles