Trivial modification of .vimrc
Add alias and merge tool for git.