Cleanup buildout fake binary to be readable.
Merge remote-tracking branch 'origin/master' into cliff
minor doc fixes