Lots of code cleanup related to constraints in the reference platform
Merge pull request #164 from peastman/master

Lots of code cleanup related to constraints in the reference platform