carbon2-commit: Merge some stuff in man, fix up Makefile