Clean up the prompts
Make prompts almost identical to preferred zsh prompts
Add a zsh-style cd that is essentially an alias to pushd