Tidy
Tidy the combination of the various defaults
Merge branch 'facia-tool-defaults' of github.com:guardian/frontend into facia-tool-defaults