Updating for new version of GrUMPy
Fixing conflict
Lot of updates including modularization and the addition of split cuts. The file will be renamed soon to reflect generality