Merge pull request #411 from ndawe/master

[MRG] histfactory: missing import of measurements_from_xml at module level
simplify silence module and fix locking
Merge pull request #412 from ndawe/silence

[MRG] simplify silence module and fix locking