Multiple relations handled as one single line in the visualization.
Merge branch 'develop' of github.com:juju/juju-gui into relation-refactor

Test failures due to lingering containers; updating from trunk.
Add tooling for auto cleaning test utils.

- Update makeContainer to use the auto cleaning.
- Update all calls to makeContainer.

Skip the notifier tests until anim can be fixed

Get initial working demo of the auto cleanup makeContainer
Update all calls to makeContainer
Clean up and get tests passing in phantom
Relations now stored in collections, one per service pair.
Merge pull request #89 from mitechie/auto-cleanup-utils

- Update makeContainer to use the auto cleaning.
- Update all calls to makeContainer.

Skip the notifier tests until anim can be fixed.

These tests are fragile and timer based. They're relying on animation completion and timed cleanup. The update to auto cleaning the container means that we've destroyed the container and it breaks the way this was intended to be tested.
Merge branch 'develop' into relation-refactor

Large test-branch with several files touched; merging for possible conflicts.
Moving relation-collections behind a feature flag for bundle visualizations
Clean-up for CI.
Update the test cleanup to be FILO
Merge pull request #93 from mitechie/filo-test-cleanup
Enable notifier tests with custom makeContainer
Merge pull request #94 from mitechie/enable-notifier-tests
Responding to review comments.
Merge pull request #92 from makyo/relation-refactor

Add in the concept of relation collections to store multiple relations between two services in a single object, allowing for a menu to display the individual relations separately.

To QA:

* run make devel, visit 0.0.0.0:8888/:flags:/relationCollections
* add hadoop, add hadoop again as hadoop1, add mysql, add mediawiki
* relate mysql and mediawiki; should look fine; should be able to delete relation by clicking on relation indicator (currently a circle)
* relate hadoop and hadoop1 twice, in multiple ways; should only see one line (right click on indicator, inspect element, should only see one .rel-group); should be able to delete *twice* (deleting specific relations coming soon with menu, but for now, deletes in order created).
* no errors on console with general QA
* no errors in tests.
Merge branch 'develop' into small-screen-notification