A few more branch display smarts.
Removed  when on 'other' branch, and changed color to white.
Red displayed only when not on a branch.
Merge branch 'master' of github.com:jmalloc/dotfiles