Fix spacing
update git-town man page
Merge branch 'master' into kg-better-docs