Improve and test support for customized templates

Change-Id: I7209c247b01dc06078d84c18e0a7beed80c6a62c
diff --git a/templates/intro.html.ep b/templates/intro.html.ep
index 3052a3e..8e37688 100644
--- a/templates/intro.html.ep
+++ b/templates/intro.html.ep
@@ -1,6 +1,4 @@
-% layout 'main';
-
-% stash(sidebar_active => 1);
+% layout 'main', sidebar_active => 1;
 
 
 <div class="intro">