Added htop to the list of packages that are installed on all our
boxes.
lock the root account after the hostname has been set.

A sensible change, proposed by drt24.
Merge branch 'master' of dtg-code.cl.cam.ac.uk:infrastructure/dtg-puppet