Merge pull request #397 from SalesforceFoundation/feature/208-settings-u...

...i

updated all packages for improved Settings labels and help text
- Manually resolved the merge conflicts here - @davidhabib may want to check this out and make sure it looks right to you