Added cbuf librato encoder.
Some basic tests.
Incorporate review feedback, better headers parsing, account for
annotations.
Merge branch 'patch-1' of github.com:Dieterbe/heka into dieterbe-doc-tweaks
Merge branch 'dev' of github.com:Dieterbe/heka into dieterbe-doc-tweaks
Merge branch 'dieterbe-doc-tweaks' into dev
Remove unnecessary or clause.
Merge pull request #1076 from mozilla-services/librato-cbuf-encoder

Librato cbuf encoder
Merge branch 'dev' into JustinJudd-schema-influx-encoder

Conflicts:
	CHANGES.txt
	docs/source/config/encoders/index.rst
	docs/source/sandbox/encoder.rst