abord build if mergeConfig returns an error and fix duplicate error message
Merge pull request #2034 from metalivedev/1969-cherrypick-fixcommitformat

Fix #1969 formatting, add information about multiline json
Add test
add missing error check
added initial draft of the Docker infrastructure doc
Minor updates to postgresql_service.rst

I've added the steps that were missing/wrong for me when I went through this just now.
tell the new developer how they can replace the real docker binary with the one they've been hacking on (#2142)
Merge pull request #2142 from SvenDowideit/patch-1

tell the new developer how they can replace the real docker binary with ...
Merge pull request #2160 from iffy/patch-1

Minor updates to postgresql_service.rst
Prevent docker-ci to test closing PRs
Merge pull request #2211 from mzdaniel/2190-docker-ci

Prevent docker-ci to test closing PRs
Remove @KSid from contrib maintainers for now

His availability has been very limited, so I'll take over completely for the short term until he can find more time to help out.
Merge pull request #2218 from tianon/ksid

Remove @KSid from contrib maintainers for now
Move contrib/docker.bash to contrib/completion/bash/docker for better organization
Add zsh completion from @felixr with permission

See https://github.com/felixr/docker-zsh-completion for the original.
See also https://github.com/dotcloud/docker/issues/2202#issuecomment-26313287

Fixes #2202
Add vim syntax highlighting for Dockerfiles from @honza

See https://github.com/honza/dockerfile.vim
See also https://twitter.com/_honza/status/390046317579620352
Fixed broken tests

Some tests failed because the `auplink` binary was not found inside of the
"docker" container.
Fix #1919 document how to edit and release docs.
hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
Merge pull request #2230 from shykes/hack-select-test

hack: only run certain tests with TESTFLAGS='-run TestName' make.sh