Merge branch 'univpoly' of ../../coq/git into trunk
Merge branch 'trunk' of github.com:HoTT/coq into trunk
Fix bug spotted in issue #35, now treating Prop/Set specially as rigid universes
that can't be identified.