Disruption Logic complete

Completed adding disruptions to the model, but still want to tweak
further to get the arguments to be easier to pass. Also, found that 7
day pipeline inventory brings our total inventory levels down to well
below the quoted levels for longer transits.