Merge branch 'master' of https://github.com/zilin/docker into zilin-master

Conflicts:
	container.go
Merge pull request #2641 from artagnon/master

CONTRIBUTING: wrap a couple of long lines
Merge pull request #2646 from fgrehm/contrib-vagrant

Update contrib/vagrant-docker with projects available
use utils.ParseRepositoryTag instead of strings.split in docker images
Change crypto export notice to meet Debian requirements
Add ability to exclude files from tar
add wait, stop, start, restart, rm, rmi
Merge pull request #2621 from rogaha/rm_del_all_example

- Added delete all the containers example (docker rm `docker ps -a -q`)
Merge pull request #2527 from jpoimboe/fedora-iptables-fix

Fix container networking on Fedora
- Added a doc about Links and Container Naming
on docker start, do not cleanup if already running
fix nameserver regex.
Allow drivers to implement ApplyDiff in Differ interface
modify test of GetNameserversAsCIDR for its regex change.
- Improved documentation and typos fixing (Thanks to @jamtur01)
Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert

Conflicts:
	server.go
Add clarification of multiple "go test" calls in hack/make/*test
Merge pull request #2669 from tianon/clarify-test-calls

Add clarification of multiple "go test" calls in hack/make/*test
Merge pull request #2657 from dotcloud/fix_docker_images_output

use utils.ParseRepositoryTag instead of strings.split in docker images
Merge pull request #2614 from dotcloud/prevent_delete_image_running_container

Runtime: prevent deletion if image is used by a running container