Adding vimdiff stuff