Merge pull request #503 from ndawe/master

[MRG] Hist: merge integral_error into integral