Clean up lots of stuff in country list and map; add legend to map
Merge branch 'master' into gh-pages