Update .zshrc

Added new prompt and merged old zshrc;cleanup