Merging conflicts
Resolving conflicts
Fixing dataset json serialization
Cutoff heatmap module; HCL WIP
Fixing imports
Merge pull request #361 from lev-kuznetsov/master

Resolved a few conflicts, fixed json serialization, HCL WIP, fixed imports, cutoff heatmap module (source remains but no longer compiled)