Initial merge into juju repository

This PR is the initial merge of previous work into the juju/jujusvg repository.
I can't find where this is used. Is it serialized somewhere that I can't find?