Merge pull request #44 from juju/local-charm-bundle-support