Updated geojs to current master