Update vimrc and gitconfig

- Gitconfig has vim as merge tool
- vimrc has shorcut to open and update the vimrc file
Merge branch 'master' of https://github.com/ovu/dotfiles