updates per nick and thomas
Merge pull request #238 from deb-cfengine/install4

updates per nick and thomas