Give the branch-making tool a uniquer name
Merge fix-mkbranch

Author: exarkun
Reviewer: jml

Changes the name of the mkbranch script to avoid conflicting the existing mkbranch script in Combinator.
Merge branch 'master' into generalize-force-build