fix broken addconstr
Merge branch 'master' of github.com:JuliaOpt/JuMP.jl
Merge branch 'master' into callbacks
I like macros, but we can use a function here