Collision Matrix changes

Here is the collision matrix refactor into triangular arrays. I also re-added Ray to the build because I was using it.