vim plugin changes
Merge branch 'master' of https://github.com/aswink/vimstuff
vimrc update