work in progress
Fixed merge conflicts
Fixed bug that led to wrong stochiometric matrix
Fixed bug in creation of new style propensity file.