Major simplification to constraint handling in reference platform
Merge pull request #230 from peastman/master

Major simplification to constraint handling in reference platform