Improved __str__ for TimeMachine
load_model has now a solver_interface keyword argument

Can be a string like 'cplex', optlang.cplex_interface or just None in which case load_model will return a cobrapy model
flux_variability_analysis provides a remove_cycles keyword argument now
Weird conflict resolution