Merge pull request #10 from pmorie/list

Add list-containers
Tweak list-containers