replace 127.0.0.1 by the assigned IP address in the container's /etc/hosts file.
change 127.0.0.1 -> 127.0.1.1 & remove ::1 -> hostname mapping
Merge remote-tracking branch 'upstream/master'

Conflicts:
	container.go
Container memory limit can be specified in kilobytes, megabytes or gigabytes

    -m 10  # 10 bytes
    -m 10b # 10 bytes
    -m 10k # 10240 bytes (10 * 1024)
    -m 10m # 10485760 bytes (10 * 1024 * 1024)
    -m 10g # 10737418240 bytes (10 * 1024 * 1024 * 1024)

Units are case-insensitive, and 'kb', 'mb' and 'gb' are equivalent to 'k', 'm' and 'g'.
Update ubuntu packaging script, especially to stop docker group deletion
- Added delete all the containers example
make all image ID and container ID API responses use the Long ID (Closes #2098)
- Updated description
Added status column to API client table
Vagrantfile updates.

- Remove the overrides config.vm.box and config.vm.box_url and use
  the same values for all providers.
- Use the same private key path for all providers.  It is still possible
  to set a different private key path through the environment variable
  SSH_PRIVKEY_PATH if desired (your AWS key may be different from your
  Virtualbox key).
- Allow the environment variable AWS_INSTANCE_TYPE to specify the
  instance type of instead of hard coding the AWS instance type as
  't1.micro'.  't1.micro' is still the default if unspecified.
- Use the same environment variables for keys as the Amazon provided EC2
  API tools.  This allows people who already have the EC2 tools set up
  correctly to use 'vagrant up' with less environment configuration
  than before.
- Rewrite the provisioning code.  The goal is to be idempotent and to
  correctly install docker for all providers instead of just virtualbox.
  It will conditionally install the virtualbox guest additions if
  virtualbox is the provider.
- Update the AWS install documentation to reflect the changes.
CONTRIBUTING: wrap a couple of long lines

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Update contrib/vagrant-docker with projects available
Merge pull request #2630 from jamtur01/api_status

Added status column to API client table
Merge pull request #2613 from tianon/ubuntu-fpm-tweaks

Update ubuntu packaging script, especially to stop docker group deletion
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
Merge pull request #2313 from wazboy/master

Vagrant AWS update
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid

Server: always return long id's
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