Ordering groups more consistently.

When merging groups and exporting feeds, we're now obeying your
specified ordering.