Add vim diff improved tool

Used for resolving git merges

Taken from https://github.com/whiteinge/dotfiles/