Changes from rolling-in configurator version
Fix shifted-parens in L1. Thanks @technomancy
Set default layout to customized default--layout