Removed all references to the CharacterController stuff.

Replaced the few little things I was making use of with my own stuff.
This allows us to have tighter control over things like collisions.