fixes #444, Household Primary Contact should stick with first contact.
Merge pull request #452 from SalesforceFoundation/feature/420-kill-globals

fixes #444, Household Primary Contact should stick with first contact.
Merge dev into feature/184-rollup-test-refactor