Merge pull request #3 from cmsdaq/fixesAndCleanup

Tested and installed on both appliances.