More zsh and vim goodness (sortof)