Merge lp://qastaging/~jml/pkgme/rollback-r121 into lp://qastaging/pkgme

Rollback r121, as it is breaking nagios checks on staging

Our staging end-to-end checks are failing with the following error (lightly formatted by me)

liam@emim:/etc/nagios/nrpe.d$ /usr/local/lib/nagios/plugins/check_pkgme_e2e.sh /srv/pkgme-service-staging.canonical.com/staging/pkgme-service /srv/pkgme-service-staging.canonical.com/var/nagios/pkgme-e2e.out
Check failed in 8.129219: Failed to build package:
    debuild --no-lintian -S -uc -us failed with returncode 29. Output:
   | sh: 1: gcc: not found
   | dpkg-architecture: warning: Couldn't determine gcc system type, falling back to default (native compilation)
   | dpkg-buildpackage -rfakeroot -d -us -uc -S
   | dpkg-buildpackage: export CFLAGS from dpkg-buildflags (origin: vendor): -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security
   | dpkg-buildpackage: export CPPFLAGS from dpkg-buildflags (origin: vendor): -D_FORTIFY_SOURCE=2
   | dpkg-buildpackage: export CXXFLAGS from dpkg-buildflags (origin: vendor): -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security
   | dpkg-buildpackage: export FFLAGS from dpkg-buildflags (origin: vendor): -g -O2
   | dpkg-buildpackage: export LDFLAGS from dpkg-buildflags (origin: vendor): -Wl,-Bsymbolic-functions -Wl,-z,relro
   | dpkg-buildpackage: source package jabberwocky
   | dpkg-buildpackage: source version 0
   | dpkg-buildpackage: source changed by pkgme-service bot <email address hidden>
   | sh: 1: gcc: not found
   | dpkg-architecture: warning: Couldn't determine gcc system type, falling back to default (native compilation)
   | dpkg-source --before-build jabberwocky
   | fakeroot debian/rules clean
   | dh clean
   | dh_testdir
   | dh_auto_clean
   | sh: 1: gcc: not found
   | dpkg-architecture: warning: Couldn't determine gcc system type, falling back to default (native compilation)
   | dh_clean
   | dpkg-source -b jabberwocky
   | dpkg-source: error: can't build with source format '3.0 (quilt)': no upstream tarball found at ../jabberwocky_0.orig.tar.{bz2,gz,lzma,xz}
   | dpkg-buildpackage: error: dpkg-source -b jabberwocky gave error exit status 255
   | debuild: fatal error at line 1350:
   | dpkg-buildpackage -rfakeroot -d -us -uc -S failed

   Other data: {u'dependencies': [], u'packaged_app_url': None, u'pkgme_distro_arch_series': [], u'pkgme_extra_data': {u'executable': None}}

This branch rolls back the latest changes to pkgme in the hope that it will fix this error.

jml