changed map display to country name on hover, and changed country colors
add country name to mouseover on map
fix merge conflicts
Merge pull request #24 from davek09/master

map formatting