clean up code for adding popup, and show popup when click the country name
Merge branch 'master' of github.com:csviz/csviz