Merged ExperimentalBranch into master; Begin re-modularization of the collision detection process.