Clean up some containers
Merge pull request #186 from dorkster/fixes

Clean up some containers