Great, looks good now, then.

I wonder if we should be using ConfigurationItems when we know the setting will be temporary? (that is, presumably it will disappear in 0.3).  No need to change this here since it's all ready - I'm just sort of thinking out loud.  And anyway, this'll be a good excuse to implement the configuration file updating scheme we said we wanted to have by 0.3 :)