Neil's local changes
merge misery managed
bibtex ballsup beaten
second HoTT paragraph