Improve the way we detect branch data
    
    Not only does this now work with old/new style branches, but it also
    fixed up some improper regex use that could have caught too much.  It
    can be simplified once the branch renames are done.