merge Masstree

The last commit makes Masstree the default. Don't care whether that one gets merged along with the others.