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
Add option to disable default persistent TCP connections to ES
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.
add description of new 'http_disable_keepalives' option
Note that an internet connection is required to build
Comma separate fields in ESJsonEncoder

Currently it creates invalid json if fields is the first item in the array.
Spaces -> tabs
Update ESLogstashV0Encoder to add config.Fields

The documentation covered it, but it was not functional.
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 #1088 from validname/validname-es-http_disable_keepalives

Add option to disable default persistent TCP connections to ES
Merge pull request #1097 from markabey/docs-note

Note that an internet connection is required to build