Improve table alignment
Add support for non-feature branches
git ship merges before squashing
Merge branch 'master' into kg-pushing

Conflicts:
	README.md
	features/git-sync.feature
	release-notes.md