Integrate first round of changes.

Thank you, Johannes S.!
Refine git chapter some more.