Revert "Unused ERBs? Either merge this branch, or find the usage, and add a test..."
Merge pull request #879 from afred/revert-861-erb-purge-layouts

Revert "Unused ERBs? Either merge this branch, or find the usage, and ad...