Cleaned up TreeCapitator support code and added new trees
Merge pull request #329 from bspkrs/master

Cleaned up TreeCapitator support code and added new trees