Split custom_badges_really_ordered

Fixes #545 by splitting custom_badges_really_ordered into add_custom_badges and shift_custom_badges.

Keep in mind that the logic has flipped - shift_ and add_ need to be True by default.
If we take out ADD_CUSTOM_BADGES, what will this be based on?