Update settings.yml
Update README.md
Update settings.yml
Fix link to instructions for making plans public
Update README.md
Merge branch 'master' into develop

Conflicts:
	README.md