Disable zsh-vcs-prompt with background prompt due to CPU issue. Minor tidy up.