resolves #188: git-ship with no shippable changes
Merge branch 'master' into cr-separateGitHelpers

Conflicts:
	helpers/git_helpers.sh