Fix: zsh completion not working

Tested:
- Ubuntu 14.04
- zsh 5.0.2
Merge branch 'FixZshCmpl'