Merge pull request #550 from ndawe/master

[MRG] HistFactory: set sample histograms in __init__