update makefile
update dockerfile
using buildout 2.x