More puppet

setup.sh is redundant with Puppet. Let's move these things into Puppet.