Separate Trapping/Detrapping + plotting
This separates the trapping and detrapping models. The reason, among others, is that the current implementation draws one random number for both trapping and detrapping. With adding complexity to this and requiring different parameters, separating these seems in order.
In addition, a few histograms were changed and/or added.