Misc changes in vim and zsh