Removed ineffective deal triggering war code.
Added buildings that end wars and traits that cause rebellions.