Collision update

Basic collisions working. Still need to deal with colisions due to
rotating ship in confined space.