update the ISO_VERSION=6.0
fixup mash-repo.sh for updates
add/update mash configurations
removed lame merge conflict