plugin update and vimdiff options
Merge branch 'master' of github.com:fmosca/dotfiles
updates