some small changes to vimrc
Merge branch 'master' of https://github.com/rian39/dotfile
not sure why this merge is necessary:
viminfo updates