Added the option to cherry pick hotfix commits to develop rather than merge

Conflicts:
	git-flow-hotfix