fixes in the makefile
trash thrown away
Merge branch 'master' of https://github.com/nsi-iff/sam_buildout