Several remaining bug fixes for collage performance.
Readd heatmap.
Heatmap additional work: printing. Fixed indentation in collages/show.