Shuffle around the locations of some things, eliminate some duplicate lemmas
Merge pull request #79 from mikeshulman/hset

Shuffle around the locations of some things, eliminate some duplicate lemmas