changes
un-hose git branch indicator color & add anti-longform git alias
git merge, of course