Grabbed local version of topojson for d3 and updated script reference
Fixed merge conflict