better vimdiff colors (take 2)