Preparing for git flow