Always declare templates with hbs!

Without this change it is impossible to have module.js right next to module.hbs because the names collide. This ensures that hbs! is always added to the module name, stopping the collision.