Add files for buildout.
Minor mods to complete the PyPI merge process