bump builder version in preparation for v2.2 build
Refactor build script