merge existing config when committing

Fixes #1141

Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com> (github: cap10morgan)
Update daemon docs and help messages for --iptables and --ip-forward

Fix docs and help messages of --iptables and --ip-forward to describe the true case behaviour

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
Clean up the "go test" output from "make test" to be much more readable/scannable

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Exclude more "definitely not unit tested Go source code" directories from hack/make/test

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Update port_redirection.rst

Fix flags
don't leave empty cidFile behind

This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Merge pull request #4621 from unclejack/fix_empty_cidfile

don't leave empty CIDFile behind
Merge pull request #4492 from ichik1/add-ip-forward-to-docs

Update daemon docs for --ip-forward
Merge pull request #4619 from dgageot/patch-1

Update port_redirection.rst
Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit

merge existing config when committing
Merge pull request #4612 from tianon/cleaner-test-output

Cleaner test output
Fix boilerplate text in Apache license

This commit updates the Apache license boilerplate with actual information. The Apache license appendix (designed to be removed before publication) states:

```
APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)...
```

Additionally, the copyright year was not included. Copyright notices must reflect the current year. This commit updates the listed year to 2014.

see: http://www.copyright.gov/circs/circ01.pdf for more info

Docker-DCO-1.1-Signed-off-by: Phillip Alexander <git@phillipalexander.io> (github: phillipalexander)
Merge pull request #4636 from phillipalexander/fix-license

Fix boilerplate text in Apache license