Split queen and drone threat_factor.  Added threat avoidance to drones and removed queen's friendly ship avoidance.