Git lesson improvements

[yaauie]

Feel free to cherry-pick the ones you want :)

See the commit messages for rationalizations.

(cc:@eliseworthy, the primary author of this lesson)