tree.lua: add tree.merge.
Add a rockspec for building from git, and machinery for building variant rockspecs.