Better handle nested containers and libcontainer.
Merge pull request #108 from vmarmol/fixes

Better handle nested containers and libcontainer.