Fix some refactoring issues
Finished feature 61654344/release-append.
Merge branch 'develop' into release/1.2.1

Conflicts:
	gitflow/bin/__init__.py
release: Fix some renaming left behind

Some finish -> stage and deliver -> finish renaming was left behind,
making gitflow do wrong things at various steps. This should be fixed
now.
Update README to include the latest changes
Bump version number to 1.2.1
Finished release 1.2.1 (merge into develop)