Improved collision code again...

Now the ships collide and stop when they are no longer colliding... This
way the ships wont bump and fly apart forever.