gurobi 6 support
Merge pull request #30 from rmtfleming/master

gurobi 6 support