Various improvements to git branches model