Fix for new env var DIB_INSTALLTYPE_*
Don't clean up /usr/local/bin
Add missing comma
Really don't use packaged diskimage-builder