Add Container controller, specs, and routes. See todo in spec for odd exception. Few minor fixes.
Merge remote-tracking branch 'origin/master'