Windows fix for tools/RayTracer.h since near/far are macros
Merge from Houdini trunk
Merge pull request #8 from sideeffects/send_upstream

Windows build fix for tools/RayTracer.h and changes from Houdini trunk
Version 2.0.0 prerelease
Version 2.0.0 prerelease
Merge remote-tracking branch 'upstream/master'

Conflicts:
	openvdb/Makefile
	openvdb/tools/RayTracer.h
	openvdb/tree/RootNode.h
	openvdb_houdini/houdini/GU_PrimVDB.h
	openvdb_houdini/houdini/SOP_OpenVDB_Convert.cc
	openvdb_houdini/houdini/SOP_OpenVDB_Fracture.cc
	openvdb_houdini/houdini/SOP_OpenVDB_From_Particles.cc
	openvdb_houdini/houdini/SOP_OpenVDB_From_Polygons.cc
	openvdb_houdini/houdini/SOP_OpenVDB_To_Spheres.cc
	openvdb_houdini/houdini/SOP_OpenVDB_Vector_Merge.cc