Rolling thunder

This fixes a few of the bugs resulting from our merges. The heat map bubbles and info box box loads. 
But... we have a TON of refactoring to do tomorrow.