s/ReadBundle/ReadCharmArchive/
Merge branch '012-charm-v2' of github.com:frankban/juju into 012-charm-v2