Merge branch 'features/issue_386' of github.com:michaelgibson/heka into michaelgibson-features/issue_386

Conflicts:
	plugins/elasticsearch/elasticsearch.go
	plugins/elasticsearch/elasticsearch_test.go
Merge branch 'michaelgibson-features/issue_386' into dev