Merge pull request #1 from pmorie/build

WIP: build
Merge pull request #2 from pmorie/build

integration test
Rename builder.go to build.go