Add zsh and a few other bits (tidyup due)