added lua encoder for InfluxDB
removing hanging unused variable
Merge remote-tracking branch 'upstream/dev' into dev
Fixed InfluxDB Lua encoder based on suggestions
Merge branch 'dev' of github.com:JustinJudd/heka into JustinJudd-dev
Incorporate review notes, add changelog entry, add required includes
into docs.
Merge branch 'dev' into JustinJudd-schema-influx-encoder

Conflicts:
	CHANGES.txt
	docs/source/config/encoders/index.rst
	docs/source/sandbox/encoder.rst
Allow ScribbleDecoder to set severity from the message template.
Don't accept non-integer severity values.
Merge pull request #1089 from mozilla-services/message-template-severity

Allow ScribbleDecoder to set severity from the message template.
Prevent orphaned matchers from being registered with the router in
cases where multiple TOML files specify filter and/or output plugin with
the same name. Also output pack diagnostic idle time in seconds
rather than nanoseconds.
Use API instead of doing the math.
Merge pull request #1098 from mozilla-services/orphaned-matchers-bug

Orphaned matchers bug
Graylog2 Extended Format Decoder
Add config option to get the @type to match the index _type

Default to false to not mess with existing setups.
Logstash V0 behaviour is type_name_match_at_type = true
Add Docs for eslogstashv0 type_name_match_at_type
Merge remote-tracking branch 'upstream/dev' into ESjson-fields
Merge pull request #1091 from christianvozar/features/graylog2-decoder

Graylog2 Extended Format Decoder
Merge branch 'dev' into JustinJudd-schema-influx-encoder
Pull req #1104 - change config name (Breaking)

new config option is "use_message_type" - default false (Breaking)

Also return errors if the type_name interpolation fails

Currently this doesn't error in the coordinates.go, so it can result in a
situation where interpolation silently fails when use_message_type is true, or
"Type" isn't in the fields list