Try once again to make munin be quite about entropy's slow SD card
Merge branch 'master' of dtg-code.cl.cam.ac.uk:infrastructure/dtg-puppet
Merge branch 'master' of github.com:ucam-cl-dtg/dtg-puppet