Merge remote-tracking branch 'origin/bug#2_update_vgl'

* origin/bug#2_update_vgl:
  Updated to use current vgl
Fixed geojs cmake
Merge remote-tracking branch 'origin/fix_geojs_cmake' into next

* origin/fix_geojs_cmake:
  Fixed geojs cmake