Allow branches to have the word "master" in them
Fix issue #1. Rebase all now tracks the merge-base of each branch