Allow Gurobi as drop-in replacement for CPLEX
Fix some missed occurrances of CPLEX