Several vim updates per recent @mcmire dotfiles cleanup