Update nextoo_repo_conf.sh

Move git merge to top of script and pull most USE flags out