Do not need any apache yuk in DHCP
Merge branch 'master' of dhcp:/etc/puppet-bare
Don't monitor http on dhcp
Add Mattias as a user on all VMs but don't give him sudo

This will break things on yousense but that config is already broken and
we can fix that when we need it
Merge branch 'master' of test-puppet.dtg.cl.cam.ac.uk:/etc/puppet-bare