scripts/make-package: Reorganize a bit.
scripts/merge-real: Add more debug output. Improve the version checks.
scripts/merge-real: Fix a debug print.
scripts/sign: Disable X by default.
scripts/bachroot: Move the blackarch mountpoint.