[MRG] Hist: merge integral_error into integral