ensure the latest puppet
put puppet in a class
fix various issues
add basic puppetization for monitor
include apt in base to fix dependency cycle
update hosts
don't include apt in base to fix dep cycle (?)
Merge remote-tracking branch 'upstream/master'