Move yum repo back into default recipe

The original reason for splitting it out is no longer required.
Alphabetize