Handle the non-build-from-scratch case

We only run the previous stanza if git and pip are missing.
So if you have an existing 14.04 image and cut a new one, you'll
still run into problems where ansible dies missing httplib2 and we
never install it without a scratch build.

util/vpc-tools/abbey.py

@@ -296,9 +296,14 @@ if [[ ! -x /usr/bin/git || ! -x /usr/bin/pip ]]; then
     /usr/bin/apt-get update
     /usr/bin/apt-get install -y git python-pip python-apt \\
         git-core build-essential python-dev libxml2-dev \\
-        python-httplib2 libxslt-dev curl libmysqlclient-dev --force-yes
+        libxslt-dev curl libmysqlclient-dev --force-yes
 fi
 
+# this is missing on 14.04 (base package on 12.04)
+# we need to do this on any build, since the above apt-get
+# only runs on a build from scratch
+/usr/bin/apt-get install -y python-httplib2 --force-yes
+
 # upgrade setuptools early to avoid no distributin errors
 pip install --upgrade setuptools==18.3.2