Updating geojs and vgl to versions from master