Support popups on choropleth

Created by: slifty

If a marker has a popup value we should support popups even if the marker is a geojson feature isntead of a lat / lng pin.