zsh update
Merge branch 'master' of github.com:maruks/.emacs.d