Fix git-flow versus git-mf differences in check
for initialization
Add feature branch handling
Merge branch 'bugfix/test'

Conflicts:
	gitmf-common