Tree-consolidation cleanup

* make Systems and Processes use base_objects/tree.mustache
* fixup directives/tree.mustache template slightly
* use + <model_name> instead of + Object in some cases