Update discovery

This code is pretty ugly.  I think it's getting less ugly but it's still pretty incomprehensible.

It does works significantly better though...
I tried using py.test the other day, and the rewriting it does to show the values in this style worked out of the box. I'd suggest trying py.test as a nosetest drop-in replacement for your local workflow.