Merge pull request #212 from thefinestsieve/beta

Updated plot events and faction decisions