Heatmaps Refactoring

Decided to combine the heatmapTree and heatmapObject as they were too
closely intertwined to be separated.  we'll see how this impacts
visualization efforts.  I also finished changing the name in all of the
visible areas.