Update zsh completion
Merge branch 'master' into osx