Some of my recent changes turned out not to work very well. Also, some other changes were needed to get the mobile sites functionality working properly, and to be able to split out on chiark configuration for "unusual" sites. Signed-off-by: Ian Jackson <ijackson at chiark.greenend.org.uk>