resolve one TODO, replace with two more :/
testing: AgentConfigForTag now takes a Tag not a string
WIP style guide
Merge pull request #250 from waigani/style-guide

WIP style guide

First pass at a style guide. Most of this *should* be common sense. Yet, as everything listed here frequently comes up in code reviews, there is arguably a need to make common sense a little more common.

I expect there will be some debate over what is a juju convention/style vs someone's opinion. As such, I provide this doc only as a starting point and I am not attached to any given convention in there. The benefits of agreeing on and clarifying our conventions upfront are: easier 'on-ramping' for newbies and quicker reviews.

I will start a juju-dev thread for this PR, please use it for debating what should/shouldn't be in the style guide (or even if you disagree that we need a guide).
Merge pull request #265 from davecheney/131-names-refactor-part-iv

131 names refactor part iv

testing: AgentConfigForTag now takes a names.Tag not a string.

Resolving the type of the tag returned from AgentConfig.Tag() will require more effort.
Merge branch 'master' of https://github.com/juju/juju into 132-names-refactor-part-v
fix panic when info.Tag is nil (user is admin)