Changing everything in choropleth to handle data joins with map generically
Now countries and states choropleths working and can switch between them