Merge remote-tracking branch 'origin/fix_geojs_cmake'

* origin/fix_geojs_cmake:
  Fixed geojs cmake
Updated vgl to use shapefile reader
Merge remote-tracking branch 'origin/update_vgl' into next

* origin/update_vgl:
  Updated vgl to use shapefile reader