Merge pull request #85 from nhr/master

Improved Origin / Puppet support