use zsh from vim
Merge branch 'master' into clypd

Conflicts:
	vim/vimrc.symlink