Fix failing test on MacOS.

Fix failing test on MacOS.

Also update docs to include vivid.

Tests: `make check`.
No QA required.

https://code.launchpad.net/~frankban/juju-quickstart/fix-macosx-failing-test/+merge/246290

(do not edit description out of merge proposal)

[frankban, 2015-01-13 12:33:49]

Please take a look.

[bac, 2015-01-13 13:02:05]

LGTM, thanks.

[bac, 2015-01-13 13:04:23]

Verified tests pass on OS X 10.10

[martin.hilton, 2015-01-13 13:41:04]

LGTM

[frankban, 2015-01-13 13:42:32]

*** Submitted:

Fix failing test on MacOS.

Also update docs to include vivid.

Tests: `make check`.
No QA required.

R=bac, martin.hilton
CC=
https://codereview.appspot.com/191640043

[frankban, 2015-01-13 13:44:41]

Thank you both!