Added vimdiff as a difftool
Added vim colors and modified theme