Fixed template inclusion for nested templates.

Nested templates were not being included in the template manifest,
because the ** selector apparently ignores slashes under some
circumstances. This fixes the issue, and also sets up a watch
target that matches the actual template-to-js command.

Change-Id: I86b13dfb16e21cc81cb391a82e7ccb63550dbb11