Added a benefit from previous work heuristic
Made benefit-from-previous-work heuristic off by default.
Fixed tests.
Playing with the compare-rest-conf heuristic.