CAUTION:
1) tree_converter can no longer import entity_types -- not sure how to fix the circular dependencies. Because of this I was not able to add the 'Washington, D.C.' sentence to the augmented tree dict.
2) evaluator_finegrained has not been tested at all