added vimdiff settings