Collision system requires velocity.  Also fixed a bug where collisions would not reset after being resolved