update buildout script and gulpfile to clear test code
merge fix