Improved features for git-ship
Merge branch 'master' into aw-finish-config