I merged my d3map branch into master on my side so you can pull it in. 

I'm now working on a googlemaps branch