Make that default
Merge branch 'application_yml_enhancements' into layouts_might_be_nil