Merge pull request #551 from ndawe/master

[MRG] histfactory: rm make_model and make_models. Use make_workspace