Merging in calculations into PlotTDiff
Renamed CFTime generator and added a feature to not load time shifts.