Merge dev into feature/47-hhaccount-conversion
Added handling for moving non 1x1 accounts to primary affiliation for
the contact and generating a new affiliation for that contact, setting
it to primary.  

Added new test method to cover this behavior
Merge branch 'feature/47-hhaccount-conversion' of github.com:SalesforceFoundation/Cumulus into feature/47-hhaccount-conversion
Syntax update
Added logic to check for the existence of current Household Accounts in
the org and contact associated with them and display a warning if any
are detected

Fixes #743
Merge pull request #749 from SalesforceFoundation/feature/47-hhaccount-conversion

Feature/47 hhaccount conversion
Merge dev into feature/485-cinnamon-tests