Changing run_emerge to run_merge, changing both setup_portage and setup_myfeatures...

Changing run_emerge to run_merge, changing both setup_portage and setup_myfeatures to add any USE changes to make.conf prior to merge, then removing the settings added, rather than (ab)using the environment.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1333 d1e1f19c-881f-0410-ab34-b69fee027534