Improved Origin/Puppet support
Additional changes to support puppet workflow
Merge pull request #85 from nhr/master

Improved Origin / Puppet support