`git branch` upstream-setting fixes

also helper script for checking installed `git` version
ha! you would think!

except when I tried to run on demeter, which has python 2.6, [which doesn't have `check_output`](http://stackoverflow.com/questions/4814970/subprocess-check-output-doesnt-seem-to-exist-python-2-6-5).