Events collection

Small stylistic nit: this would be more concise as

    if old_entry.has_key?('broker') && broker = self[:brokers].where(:name => old_entry['broker'])
      puts "Adding broker #{broker[:name]}"
      entry[:broker_id] = broker[:id]
    end

Could also get rid of the puts, since it produces a lot of debug spew