Merge pull request #1064 from SalesforceFoundation/feature/1063-require-households-3.1

Require Households 3.1
Removing methods that set custom settings and receive one parameter. Rewriting tests to instead use new methods that get settings for tests.
Merge dev into feature/1060-refactor-getcontactssettings
Fixing build error.
Fixing ERR_Handler_TEST.
Test for #1058.
Minor clean-up changes.
Merge pull request #1068 from SalesforceFoundation/feature/1060-refactor-getcontactssettings

Feature/1060 refactor getcontactssettings
Merge dev into feature/1063-require-households-3.1