updates per thomas
Merge pull request #236 from deb-cfengine/install4

updates per thomas