Merging master with tooltips, zooming map, etc. into GH pages