elide 'on <branch>' if no branch (i.e. rebase or detached head)
pull in more oh-my-zsh functions
cover all variables
use new dirty mode shortcut
use git remote stuff
comments and color
move where the space comes from
conditional spaces