remove spurious index entries
remove merge gibberish
some comments on rules
Merge branch 'master' of github.com:HoTT/book