Update zsh-completion
Update syntax-highlighting
Merge branch 'master' into custom