Better switching to git flow story

Fixes #296