more work
Merge branch 'master' of github.com:joehuchette/StochJuMP.jl into scoping_vars
testing things merged correctly
Merge pull request #2 from joehuchette/scoping_vars

fix renaming mess(?)