Reduce redundancy
Fix array out of bounds in updateHeatmap
Merge branch 'master' into public_demo_20130402
Tab/space normalization