Refactor to simplify constraints
Merge branch 'master' of https://github.com/IainNZ/JuMPeR.jl