updated vimrc
Merge branch 'master' of ssh://github.com/winchendonsprings/.dotfiles