Switch to git flow, refs #227