Heka Issue #287 Remove the match capture
Merge pull request #12 from mozilla-services/issue_287

Heka Issue #287 Remove the match capture
Merge branch 'dev' into features/cloudwatch-plugins

Conflicts:
	testsupport/mock_pipeline.go
Update input mocks for changes in dev.