Minor refactor of branches and git module
Started bmpt finish.

Need to handle the post-merge behavior and how the resume hook
will work.