Changed cplex.jar file (other one was out of date)
Found some code marked "put this back in". I put it back in.

Specifically, in the WaterfallILP, the huge sample-based MIP was being
run. This is no longer the case.
Added simple test case in the main method. Other minor changes.