like, whatever...
Merge branch 'geo' of https://github.com/finleysa/git-branching into geo