Update zsh git prompt

Change symbol for merge conflicts and add indicator for detached HEAD
state.