Deploy parts of Settings
It would be nice if you broke up the settings into smaller subcomponents. For example the Security settings would be more useful if you extract out the password policy changes so we can pick and choose what Security settings we need. I thought of this concept similar to how you break up profiles into sub component. This could get noisey in the list of changes so an alternative to that could be to bundle it under components like how CustomObjects work.