Update Geometry.js

Split merge into two functions: mergeGeometry which takes THREE.Geometry as its first param and mergeMesh which emulates the old behavior of the THREE.GeomertryUtils.merge() function which allowed a THREE.Mesh object to be passed.