color fixes for zshrc
Merge branch 'pre-pull'
qfgrep and other tweaks