Added vi swap file to ignore
Update to npo02 3.0
Merge pull request #759 from SalesforceFoundation/feature/npo02-v3

Upgrade to Households 3.0
Merge dev into feature/485-cinnamon-tests