Switched to html5 canvas with coffeescript for the heatmap. It's pretty sweet. (fixed accidental deletion of start code in previous commit).
Merge remote-tracking branch 'origin/master'