RR 2.5.4.1

I like the new subversioning method from 2.6 so I'm using it here.

Restores Basic Components and tweaks the MFR config to unbreak stuff.

DON'T PREMATURELY KILL CONTENT AGAIN. You rolled back MFFS and forgot to reinstate Basic Components.