Revert "re-add gitflow thingy"

This reverts commit 4868facf63186796a0f0f5e5a54cd9f439336be7.