Merge in .zshrc from poppy-dev.