Flatten ContainerSpec.
Merge pull request #242 from vmarmol/flat-spec

Flatten ContainerSpec.