updating fork

finishing up rebellions code

Three failed merges, fsDevelopments (changing FS counts needs to be handled, will deal with it tomorrow), randomNonindividualEvent.tw, and reRelativeRecruiter.tw (both to be handled by fcanon). Also need to track down loose .prostateImplant in the code and move them to .prostate == 3.

Chooses own job overhaul, bug fixes, vanilla changes and new universal rule to deny slaves from choosing to assign themselves to facilities.