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