cleaned up git helpers, added git flow helpers