Move types out to a third part to break the dependency cycle
state: more type shuffling
state: move moving things around
gb ./... passes
tests pass
Merge branch 'master' of https://github.com/juju/juju into 210-apiserver-state-refactor

Conflicts:
	cmd/jujud/machine_test.go
	cmd/jujud/upgrade.go
	cmd/jujud/upgrade_test.go
responding to review feedback
Merge branch 'master' of https://github.com/juju/juju into 210-apiserver-state-refactor
Rename test to follow source.
provider/local: fix test failure
Fix bug introduced by zealous refactoring
Merge pull request #1103 from davecheney/210-apiserver-state-refactor

Break dependency between state and apiserver/params package

This PR breaks the dependency between the `state` package and the `apiserver/params` package. 

Specifically the types that were imported by `state` from `apiserver/params` have been moved to a third package, the root of the repo. This is only a temporary measure to break the dependency, please don't get too hung up on the location of these types.

The plan from here is to move the relevant types into `state` if necessary, and relocate the others to the appropriate place.

This will also remove all the nasty functions that translate from constants in `state` like Life or Status to constants that were in `apiserver/params`