I agree with @jackson that we ought to settle on where we want $GOPATH to be, before we put it in sprout.  The rest of the changeset is probably good to commit though.