Improve zsh, fix vim plugins