Readme & buildout clean up