merge Masstree

The last commit makes Masstree the default and puts Silotree in .silotree dirs. Don't care whether that one gets merged along with the others.