Fixed config
Merge branch 'master' of git://github.com/inliniac/suricata into experimental
 - Message aggregation
 - Updated filenames
 - Added Flag SUPERFLOW_FLAG_MESSAGE_OVERFLOW to superflow state
 - Changed message tests
 - Superflow unittests and bugfixes
 - Added superflow aggregation (nothing is aggregated right now, but the superflows are assigned to the flows
 - More unittests
 - Renamed SUPERFLOW_TIMEOUT to SUPERFLOW_MESSAGE_TIMEOUT
 - Renamed SUPERFLOW_MAX_LENGTH to SUPERFLOW_MESSAGE_MAX_LENGTH
 - Added unittest for SUPERFLOW_MESSAGE_TIMEOUT
 - Message finalizing and aggregation of superflow added
 - Handling of STREAM_EOF
 - Unit test for entropy and multiple flows in a superflow
 - Bug in MessageSuperflowFinalize fixed
Settings changed to make suricate use more memory and make it able to process more input data
 - Moved configuration of superflow parser to config file
 - Added come performance counters for superflow
 - Updated comments
 - Some minor fixes
 - Removed all warnings from work/*
- Added detection rule for superflow messages
- Added detection rule for superflow messages
Merge branch 'experimental' of github.com:MofX/suricata into experimental
 - Superflow can be globaly deactivated
 - Some improved tests