Monitor berrycider.

It's a service that's being used. When I break the world, I am more
careful with those services listed in Munin or Nagios. This should stay up.
Monitor that http on ott.cl.cam.ac.uk works
Merge branch 'master' of git:infrastructure/dtg-puppet