Combine first two pages of options together; rearrange vaguely thematically
Fix bug with previous commit
In character dumps, don't include origin information for non-wearables and don't include flags from the object base.
Add support for animate_flicker option.
Merge branch 'mac-flicker' of https://github.com/bensemmler/angband into mac-flicker