Merge pull request #12 from jhadvig/origin_all_containers

Upstream merged PRs
Revert "Upstream merged PRs"
Merge pull request #14 from openshift/revert-12-origin_all_containers

Revert "Upstream merged PRs"
fix non-gofmt'd things
Handle invalid pod name
ListContainer filter