Added new directives to support complete standalone operation.
Merge branch 'master' of github.com:psigen/puppet