Merge pull request #89 from mikeshulman/truncequiv

naming and arguments for contr_equiv and trunc_equiv
Merge pull request #90 from mikeshulman/eqvar

Add Kristina's better proof that IsEquiv is an hprop.
Merge branch 'upstream'
Merge branch 'upstream'