Config directory support.
Add note re: regex tester.
Merge pull request #748 from mozilla-services/doc-regex-tester

Add note re: regex tester.
Merge pull request #747 from mozilla-services/logstreamer-dir-config

Config directory support.
Skip the obvious irrelevant files when loading heka config dir. Not a
complete solution to #750, but deals with the biggest pain point.
Merge pull request #751 from mozilla-services/exclude-config-files

Skip the obvious irrelevant files when loading heka config dir. Not a
Changelog update.
Merge branch 'versions/0.5' into dev
Release prep.
Merge branch 'versions/0.5' into dev

Conflicts:
	CHANGES.txt
Pull in a new lua_sandbox to fix JSON encoding of empty strings
Merge pull request #754 from mozilla-services/sandbox_json_serialization

Pull in a new lua_sandbox to fix JSON encoding of empty strings
Fix the max_hosts check to properly reclaim expired hosts when at capacity
Merge pull request #756 from mozilla-services/cbufd_host_aggregator

Fix the max_hosts check to properly reclaim expired hosts when at capaci...
Add an Apache access log decoder
add BufferedOutput

Extracts the queuing functionality out of TcpOutput.go into a general purpose lib for use in any output module
Merge remote-tracking branch 'upstream/dev' into buffered-output-helper

Conflicts:
	CHANGES.txt
Merge pull request #743 from davidbirdsong/buffered-output-helper

general purpose file buffering for output plugins
Merge branch 'dev' into apache

Conflicts:
	CHANGES.txt
Add Apache decoder test

- duplicates the Nginx test with equivalent log format string