merge 2.1.1 into 2.1
merge 8.8.1 into 8.8
homotopy: clarify some things
Merge branch 'master' of github.com:HoTT/book