Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Remove outdated sample JSON config file, spruce up and add links to `pipeline`
package top level docs so we look better on the godoc.org site
(http://godoc.org/github.com/mozilla-services/heka/pipeline).
Better formatting.
Merge branch 'dev' into features/fileout-hang-on-shutdown