Next

Wrapping up a bunch of smaller changes:
- https://github.com/inliniac/suricata/pull/1051
- https://github.com/inliniac/suricata/pull/1059
- https://github.com/inliniac/suricata/pull/1013
- https://github.com/inliniac/suricata/pull/1070
- Adds tx_id to json logs