Various changes to vim and zsh