Separate git-ship tests
Reset_to_sha helper
Commit_open_changes helper
Better commit message for WIP commit
Merge branch 'master' into kg-git-kill

Conflicts:
	features/step_definitions/branch_steps.rb