Improved features for git-ship

@charlierudolph @allewun general feature improvements
Okay, I have removed this here, since I don't feel too strong about this particular instance. In general we will have to find a good middle ground between meaningful branch naming and not taking that to an extreme.