Added additional parameter to FileOutput flushInterval. This enables the use of and AND statement to flush data to disk if two requirements (time and number of messages) occurred.
Revert "Added additional parameter to FileOutput flushInterval. This enables the use of and AND statement to flush data to disk if two requirements (time and number of messages) occurred."

This reverts commit 54732f696fdb16910fff1b7c2fbd7be9eaf7b00c.
Added two new parameters 'flush_count' and 'flush_operator'.
Add support for multiple stats per UDP packet
Add subject parameter for user defined subject line in emails
Ensure Emails are RFC2047 and RFC2822 Compliant

Tested with SendGrid + Google Mail for Business. Without this fix
emails sent to Google Mail will bounce with response: Reason: 550 5.7.1
[0.0.0.0 11] Our system has detected that this message is not RFC 2822
compliant. To reduce the amount of spam sent to Gmail, this message has
been blocked. Please review RFC 2822 specifications for more
information.
Update test for Base64 Encoding and Additional Headers
Remove RFC2047, Rcpt already does it
Unneeded imports
Appropriate subject encoding
Add the ability to define the network type for Issue #539
Updated to pass ctest and Travis building
Merge branch 'dev' of github.com:somergy/heka into somergy-dev
Final tweaks, added tests, docs and changelog update.
Merge branch 'multistat' of github.com:Seldaek/heka into statsd-multistat

Conflicts:
	plugins/statsd/statsd_input.go
Update changelog, don't return possibly bogus stat in error cases.
Merge pull request #682 from mozilla-services/statsd-multistat

Statsd multistat
Merge branch 'dev' into smtp-output-subject

Conflicts:
	docs/source/configuration.rst
Reset the message string every time a new pack is processed
Merge pull request #684 from mozilla-services/smtp-output-subject

Smtp output subject