updates vimrc
Merge branch 'master' of https://github.com/sbader/puppet-dotfiles