various updates
added git-flow