update a couple of puppet modules
Merge remote branch 'github/master'