Added vimdiff for git and better vimdiff colors