Use  instead of kill and rm

Docker 1.2.0 has changed the semantics of docker rm --force to
be the same as a docker kill && docker rm.