This seems to be the order in which Salesforce wants these elements. Committing the change to stop seeing it in my local changes.
Removing references to Auto_Update_Addresses__c and Clear_Invalid_Addresses__c fields in custom setting.
Combining all address verification settings in one Custom Setting.
Removing unused Custom Setting and Label.
Fixing a test and adding an additional one.
Settings some defaults for address validation settings.
Using inline help from fields in address verification settings page. Removing labels no longer in use.
Cosmetic change.
Removing deleted labels from package.xml
Merge dev into feature/521-addr-settings-page
Merge pull request #559 from SalesforceFoundation/feature/521-addr-settings-page

Feature/521 addr settings page