Prepping for git flow, changed update branch to master