Merge branch 'master' of git://github.com/dotcloud/docker into 3958_add_ability_to_remove_running_container_in_single_command

Docker-DCO-1.1-Signed-off-by: vagrant <vagrant@precise64.(none)> (github: cpuguy83)