wip
Fix test bug
Merge branch 'master' of https://github.com/juju/juju into fake-authorizer-takes-a-tag

Conflicts:
	state/apiserver/agent/agent_test.go
	state/apiserver/root.go
Remove commented out code
typo
remove debugging gre
responding to review feedback
Merge pull request #144 from davecheney/fake-authorizer-takes-a-tag

Fake authorizer takes a tag