Switching actor spawn system

Next step is to remove companioninfo, then change the companion AI to
reside in the Companion class