adding env support
Merge branch 'master' of github.com:narkisr/puppet-base-env
Merge branch 'master' of github.com:narkisr/puppet-base-env