Update json3, remove unfortunate hack

Closes #345
Update browserify
Preserve manually-set marker layer GeoJSON

Fixes #394