Appendix: reorganize for consistency with Chapter 1.
Merge branch 'master' of github.com:HoTT/book