Updates to VIm and ZSh