Qualify subprocess.PIPE with package prefix.
Ensure that CalledProcessError() call works.

Even if we find a subprocess.CalledProcessError, that one doesn't
necessarily understand the 'output' keyword.
Merge branch 'backwards-compatibility'

Some backwards-compatibility fixes to make git-when-merged work under
Python 2.6.