Merge branch 'master' of github.com:flypenguin/puppet-foreman