Improved features for git-ship

@charlierudolph @allewun general feature improvements
I like this idea but just dislike how long the name ends up here. Conflicts are a major thing this deals with and are always mentioned in the feature name. Also we can't rename main when it has conflicts with a remote, so I'd like to keep consistent and not do this rename for branches which will have conflicts.