Combine all feature branches in one.

This branch has SD sorting enabled using the persistent buffer option,
so requires a little more RAM. Turn off SORT_USES_RAM for legacy cards.