Fix formatting for Pickup and Weapon.
Add collide(Actor) to Thing
Remove Pickup; clearify confusion between Thing and Pickup.