switched more for less -R for mac in gs, added better color for ancestor/merged branches in gbs, found bug in git_branch_status