Cleanup imports
Changed to the well known pattern using collect() für multi-events.
One comment error.
Merge branch 'master' of https://github.com/juju/juju into flakey-test-machine-interfaces-watcher
Merge pull request #292 from waigani/imports-cleanup

Cleanup imports

Simple PR to cleanup imports.
Extract state/{storage,txn} as top-level projects

juju/juju/state/storage is now juju/blobstore
juju/juju/state/txn is now juju/txn
Merge pull request #294 from TheMue/flakey-test-machine-interfaces-watcher

Changed to the well known pattern using collect() für multi-events.

First implementation didn't handled fast-following changes well enough, multiple events have been fired. Changed the watcher to follow the same pattern that's used in other watchers by using collect().
Fix import ordering
Merge pull request #296 from axw/extract-state_storage_txn

Extract state/{storage,txn} as top-level projects

juju/juju/state/storage is now juju/blobstore
juju/juju/state/txn is now juju/txn
Missed an import, or merged badly, or ...
Merge upstream
Merge pull request #297 from axw/state-remove-state-txn-again

Missed an import, or merged badly, or ...
Merge branch 'master' of https://github.com/juju/juju into remove-juju-conn
Fix bad merge