Support for containers 0.4
Merge pull request #39 from snoyberg/master

Support for containers 0.4