Vladimir's almost last suggestions
Merge branch 'mscs_version' of github.com:mikeshulman/hott-categories into mscs_version