Use git-branch's output for displaying git branch name

It gives more human-readable information than git-rev-parse.
Do not use so much $()s in presets
Discard stderr in git_branch modules
Do not use colour in last line of `saji' preset

On some systems it causes problems with wrapping