wip
Merge branch 'master' of https://github.com/juju/juju into 105-introduce-tags-type-iii

Conflicts:
	dependencies.tsv
Respond (sort of) to review feedback

Update dependencies.tsv
Merge branch 'master' of https://github.com/juju/juju into 105-introduce-tags-type-iii
Merge pull request #88 from davecheney/105-introduce-tags-type-iii

juju/names refactor part 3

Updates for changes to juju/names package

dependencies.tsv change is not included, need the juju/names PR to land to get the correct commit hash