Merge pull request #214 from Lukasa/luk-sprint-branch

Sprint: More misc fixes

diff --cc jinja2/compiler.py
index 6ea124cf1c1b3012252effddc6d9a83fc4326bab,64a75cc300255b019b56e6cb7ad41b45daededca..5c7f1a61952c1715c5137271069c05bac05a9dbe
--- 1/jinja2/compiler.py
--- 2/jinja2/compiler.py
+++ b/jinja2/compiler.py
@@@ -16,8 -16,15 +16,14 @@@ from jinja2.visitor import NodeVisito
  from jinja2.exceptions import TemplateAssertionError
  from jinja2.utils import Markup, concat, escape, is_python_keyword
  import six
 -from six.moves import cStringIO as StringIO
 -from six.moves import map, zip
 +from six.moves import cStringIO as StringIO, map
  
+ # TODO: Move this to the compat module.
+ try:
+     range_type = xrange
+ except NameError:
+     range_type = range
+ 
  
  operators = {
      'eq':       '==',