fixed error in calculation of error on sd in AverageAndError.hh
Merge branch 'master' of https://github.com/PileupWorkshop/2014PileupWorkshop