HoTT/HoTT — pull request #409 by JasonGross (2014-07-16 16:21:20+00:00)
Title: Small fixes for moving to trunk

These are various small workarounds for changes and bugs in trunk. This is most of the diff, other than the difference between `Private` and `Local`.