use packaged browserify
call updateFromMap on update_geojson, ref #150
fixing merge conflict in Makefile