Various cleanups and added custom cycler.

--HG--
branch : trunk
diff --git a/tests/test_debug.py b/tests/test_debug.py
index 2363fe2..7f59445 100644
--- a/tests/test_debug.py
+++ b/tests/test_debug.py
@@ -31,7 +31,7 @@
 >>> tmpl = MODULE.env.get_template('syntaxerror.html')
 Traceback (most recent call last):
   ...
-  File "loaderres/templates/syntaxerror.html", line 4, in <module>
+TemplateSyntaxError: unknown tag 'endif'
+  File "loaderres/templates/syntaxerror.html", line 4
     {% endif %}
-TemplateSyntaxError: unknown tag 'endif' (syntaxerror.html, line 4)
 '''