Moved heatmap plotting function to plot.py
Fixing merge
Fixing merge