Collision dynamics integration

Slightly more up to date pull request.  Once collisionDetect is working, at least in some basic form, I'll test as much as I can. This code is pretty much guaranteed to be buggy right now.