Combine Tree, Whorl, Branch into Tree with Leaf
Much simplification
Merge pull request #20 from bobgru/unified-tree-type

Unified tree type