move juju.{State,Life} to multiwatcher.{State,Life} and add aliases in apiserver/params
tests pass
remove unused file
responding to review feedback
Merge pull request #1179 from davecheney/218-state-multiwatcher-more-cleanups

state: move juju.{State,Life} to multiwatcher.{State,Life} and add aliases in apiserver/params



(Review request: http://reviews.vapour.ws/r/490/)