Removed buildout/buildout extra, that's currently mostly a duplicate
of reinout/buildout.