Updated plot events and faction decisions

Brought in the latest vanilla updates which should allow antiking
faction to work properly, amongst other minor improvements
Merge pull request #212 from thefinestsieve/beta

Updated plot events and faction decisions