updates
Merge branch 'master' of github.com:aberends/puppet-integration