Removed geom from the contrib folder. Use github geom project instead
Updated SWIG files
Small cleanups