Mostly cleanup work.  Made buildout.cfg work