Only count current and past estimated/actual hours when calculating the delta. Preserve desired behavior of not counting future estimates when calculating diffs to actuals while properly totaling both. #146