Cleanup logging setup (ish)

Well at least the weirdness is localized.  More work will need to be done to
really flesh out the configuration cycle later.