[fix] wrong parameter for docker run

it's --cidfile, not -cidfile. docker complains about it when running a
container.
[fix] named containers are not removed on restart

this prevents multiple consecutive puppet runs. fixed this by removing
the container on service stop if and only if the container is a named
one.