New heatmap function, combining heatmap.plus and heatmap.2