Refined interface and fixed composite display mode calcs
Rails code cleanup
Merge branch 'master' of https://github.com/jcuratolo/heatmaps

reintegrate remote master