Begin integrating pgpbuilder 0.2.0, work in progress