added mergetool and difftool to be sourcetree
Merge branch 'master' of github.com:Nemoden/dotfiles