heatmap, pull from master; update gitignore