Fix git version parsing variable in Makefile
Cleanup help displays
Improve zsh completion