Added time tracking to simulation.
Merge remote-tracking branch 'origin/master' into probability
Tweaks to probability algorithm