puppet-senuti merged upstream

also bumping Boxen version