Initial merge into juju repository

This PR is the initial merge of previous work into the juju/jujusvg repository.
c.Assert(buf.String(), Equals,