Adding ZSH, other cleanup.