ElasticSearch: output timeout and JSON errors
Merge branch 'validname-es-parse_json_error' of github.com:validname/heka into validname-es-parse_json_error

Conflicts:
	CHANGES.txt
Merge branch 'validname-es-parse_json_error' into dev