added cplex timeout option
removed unnecessary vigra includes which broke build