Cleaned up the code for ray->quad intersection
Merge