added test for call dispatching
made the test more standard conform
Merge branch 'master' of https://github.com/juju/juju into fix-api-params

# By Ian Booth
# Via Ian Booth (1) and Juju bot (1)
* 'master' of https://github.com/juju/juju:
  Tweak hpcloud boilerplate to turn floating-ip and remove az from example region
Introduce Parse{Unit,Service,Machine}
Merge branch 'master' of https://github.com/juju/juju into 106-parsetag-refactor

Conflicts:
	state/api/deployer/unit.go
	state/api/firewaller/service.go
	state/api/provisioner/machine.go
wip
Merge branch 'master' of https://github.com/juju/juju into fix-api-params
Display welcome message when starting debug-hooks sessions.
Update for juju/names part 3
Final tweak
Merge branch 'master' of https://github.com/juju/juju into fix-api-params
state/machine: use WaitAgentPresence, rename AgentAlive
state/machine: StartSync in SetAgentPresence
state/machine: check IsManager and only Sync presence watcher
presencer: make the presencer interface official
state/presence: fixing issues from review
fixed nasty race condition
Merge branch 'master' of https://github.com/juju/juju into fix-api-params
Bug #1328716: Clean up CONTRIBUTING a bit.
update to latest juju/names