pulled from beanstalk
switched heatmap.html to globe.html
staging has new map and all updates
Merge branch 'master' of https://github.com/PhilipBrady13/xmen into updatecopy
updated copy