Add/update settings files in preparation for launch
Merge branch 'master' into staging