Git diff and merge tool is changed to vimdiff.
Git related aliases and functions added.