[Reviewer: Andy] Further egg fixes

Gah!  I hate python's multiple different packaging mechanisms.  This works around the updated setuptools issue, and is also slightly simpler.