Knocked a lot of bugs out

Put the Config class back where it was - it should not have been moved in the
first place.  I accidentally took the Config class to be a class representing
*plugin* config.