1) Populate srcDirs from GOPATH instead of build.Default.GOPATH. 2) The flag srcdir now has precedence when locating bundles