Unify man and MD page layout
Merge branch 'master' into kg-git-kill-branchname

Conflicts:
	man/man1/git-town.1