Merge lp:~lazypower/charms/trusty/docker/trunk into lp:charms/trusty/docker

[Charles Butler]

rev testing deps in tox.ini for CI

passing test run:
http://drone.systemzoo.org/github.com/chuckbutler/docker-charm/master/4bd6cdac7a4f1fa8a4040636855ffc3329a077f2

[Tim Van Steenburgh (tvansteenburgh)]

review: Approve

=== modified file 'README.md'
--- README.md	2015-09-12 02:12:48 +0000
+++ README.md	2015-09-28 14:43:57 +0000
@@ -1,7 +1,6 @@
 # Docker Charm
 
-[![Build Status](http://drone.dasroot.net/api/badge/github.com/chuckbutler/docker-charm/status.svg?branch=master)](http://drone.dasroot.net/github.com/chuckbutler/docker-charm)
-
+[![Build Status](http://drone.systemzoo.org/api/badge/github.com/chuckbutler/docker-charm/status.svg?branch=master)](http://drone.systemzoo.org/github.com/chuckbutler/docker-charm)
 
 This charm provides [Docker](http://docker.io). Docker is an open platform for
 developers and sysadmins to build, ship, and run distributed applications.

=== modified file 'tox.ini'
--- tox.ini	2015-07-10 20:52:16 +0000
+++ tox.ini	2015-09-28 14:43:57 +0000
@@ -27,6 +27,7 @@
     flake8
     charm-tools
     ansible-lint
+    simplejson
 
 commands =
     flake8 {toxinidir}/hooks {toxinidir}/modules