Jamesjames/exim on trade events consolidated

@calumhalcrow here are the final changes to fold exim trade events support into the consolidated trade events branch. thanks.