Added difftool and mergtool info to Ubuntu gitconfig and README.md