make 'make' more idempotent; update buildout files for 2.0