Add FlowEvent and PacketEvent
Update gitignore with temp files
fix merge issues