Addressing pull request #3 review comments.
Merge branch 'toscalib' of github.com:juju/juju-tosca into toscalib