Removing ships from mercs for now

Also a couple event and trait tweaks