packaging and other small changes
Merge branch 'master' of https://github.com/EMT-INRS/testbed-code