Layout specification and discovery should follow the same behavior as partials

Fixes #1047
"A" -> "An" and I don't think "view engine" needs to be repeated as words