spurious .gitignore in vmx dir, and image-prep.sh mods