Add vim, clean up zsh