Added diff.tool and merge.tool to gitconfig
Updated bashrc