Merge: refix collisions

Needed to add code jason added to PlayerInput to ship input, moved that
logic into player collision file