Progress toward #2389 and #2390. This puts the right options in the menu...

Progress toward #2389 and #2390.  This puts the right options in the menu based on whether a sprite or the stage is selected. It does not update the currently selected options menu item when you change the sprite selector menu yet though.