Even more vim updates