abord build if mergeConfig returns an error and fix duplicate error message
use less reflection in command line method invocation
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
Fixes issues with mounting subdirectories of /mnt in container.

Tested with
mkdir /mnt/data
docker run -v /mnt/data:/mnt/data  -t ubuntu:12.10 touch /mnt/data/bar

Expected /mnt/data/bar on host.
check return value of syscall.Chdir when changing working directory
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
Rename mkimage-debian.sh to mkimage-debootstrap.sh to more clearly reflect its true function
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
Refactor mkimage-debootstrap.sh to be much more full-featured

This includes the following:
- options to control certain parameters
- an option specifically for creating tarballs directly, esp. for dockerbrew
- the addition of the updates and security repositories for Debian images
- the addition of the universe, updates, and security repositories for Ubuntu images
- more correct tagging of Debian images
- tagging of Ubuntu image versions (12.04, 12.10, etc) and latest tag for LTS
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
Remove error messages which are not actually errors