Vim plugin mods and various utility updates