rename puppetmaster
new puppet commit
client stuff
Merge commit 'a94c3c41a66abadb19f438dd76e29db57214bebd'