Lots of changes to zshrc
Re-added VCS info to prompt