Trying to even out my git flow