A few style adjustments.
Merge remote-tracking branch 'origin/master'.

Conflicts:
	talk.html