Labs disclosure stuff for issue #18

Moved those two commits here instead, as we a) probably don't want this on the toolserver yet, and b) possibly ought to have a config option or something for now, though we may not want to be able to disable it when we move to labs. 

Ideas?