Improved features for git-ship
update feature names
Merge branch 'master' into cr-gitHackRemoteBranchConflict