Don't create machines that don't exist.
Lint cleanup.
Remove testing cruft.
Make it clear when a machine is a state server.
Merge pull request #471 from kadams54/services-without-machines

Don't create machines that don't exist.

**QA:**

This must be done in a real environment, in machine view.

1. Create a new machine by clicking on the "Add machine" link in the header.
2. Select a charm in the charmbrowser and click on the "Add to canvas" button. You should see a unit show up in the unplaced units column.
3. Select the newly created machine (still undeployed) so that the bare metal container is visible.
4. Drag and drop the unplaced unit on the bare metal container.
5. Deploy everything and wait a few seconds. You should get an error message (due to another bug).
6. The machine view should re-render with the unit back as an unplaced unit. The newly-created machine should now be deployed, but with nothing on it. There should *only* be one machine created. Before fixing this bug, two machines would show up in the column, one with no ID and showing the unit as being deployed, like so: http://cl.ly/image/0y2o032x2v1Z
Merge pull request #473 from frankban/state-server-machine

Make it clear when a machine is a state server.

Also simplified the machine token tests.

QA:
In sandbox mode, no change should be observed.
Using a real environment, the bootstrap node should
be displayed as "0 - State service".
Fixed issue causing the remove relation button in the inspector to fail. Also removed the relation confirm dialogue when running under the mv flag
Remove the link from the unit names in the relation error list
Added test to make sure that the remove relation button in the service inspector functions as expected
Merge pull request #474 from hatched/relation-actions-1350505

Remove relation button in the inspector works again - Fixes 1350505

The remove relation button in the relation tab in the service inspector would throw an error. This fixes that and removes the link wrapper on the unit list in the relations tab.
Fixes unit listing with test update.
Merge pull request #470 from jaycee/uncommitted-unit-update-list

Fixes unit listing with test update.

* Call aggregate update when we add uncommitted units. The unit list and unit
  count update is dependent on this operation firing off.

* Update tests to ensure this is called.