Merge branch 'master' into reduce-config-option

.circleci/config.yml

.gitignore

Gopkg.lock

Gopkg.toml

Makefile

README.md

cmd/docker-driver/Dockerfile

cmd/docker-driver/README.md

cmd/docker-driver/config.go

cmd/docker-driver/config.json

cmd/docker-driver/driver.go

cmd/docker-driver/http.go

cmd/docker-driver/loki.go

cmd/docker-driver/main.go

cmd/docker-driver/pipeline-example.yaml

cmd/loki/main.go

cmd/promtail/promtail-docker-config.yaml

cmd/promtail/promtail-local-config.yaml

docs/api.md

docs/logentry/processing-log-lines.md