merging with upstream/master
removing accidentally included falcon change
Merge pull request #56 from bbarker/gurobi_addvars

merging with upstream/master