More vim plugin changes