Merge pull request #647 from mozilla-services/issue_355

Issue #355 Add data persistence/connection recovery to TcpOutput
Merge branch 'dev' into heka-cat

Conflicts:
	CHANGES.txt
Fix default output
Fix hostname from being overwritten if its blank.
Merge branch 'dev' of github.com:mozilla-services/heka into dev
Always increase the buffer even if a record isn’t pulled out.
Avoid increments when there isn’t any new data.
Add corruption detection reporting
Fix LogstreamerInput doc typos
Fix typo
Include the unmarshalling error message and skip the match attempt
Update the usage documentation te clarify the offset is in bytes
Merge pull request #659 from mozilla-services/logstreamer_docs_fix

Fix LogstreamerInput doc typos
Merge pull request #653 from mozilla-services/heka-cat

Heka cat