Rebase with master

original Author:    Cory Johns <johnsca@gmail.com>

This was a basis of cory's earlier work to resolve divergence between
the master branch and devel branch. This now yields a 2 line diff as
of this merge point.

Dockerfile

@@ -1,6 +1,6 @@
-FROM jujusolutions/jujubox:latest
+FROM jujusolutions/jujubox:devel
 
-VOLUME "/home/ubuntu/.juju"
+VOLUME "/home/ubuntu/.local/share/juju"
 VOLUME "/home/ubuntu/trusty"
 VOLUME "/home/ubuntu/builds"
 VOLUME "/home/ubuntu/layers"

install-review-tools.sh

@@ -4,7 +4,6 @@ HOME=/home/ubuntu
 
 # Add tims awesome PPA for the 2.0 bleeding edge tooling
 sudo add-apt-repository -y ppa:tvansteenburgh/ppa
-
 sudo apt-get update -qqy
 sudo apt-get install -qy amulet \
                          build-essential \