When we do pbi builds, cleanup any leftover pkgng cruft
Merge branch 'master' of github.com:pcbsd/pcbsd