vim update
new viminfo
OOMerge github.com:3151
Merge branch 'master' of github.com:3151/dotfiles