vimrc fix
vimrc merge

Merge branch 'master' of ssh://github.com/sgoranson/dotfiles