Whitespace normalization
Merge branch 'master' of github.com:mitsuhiko/jinja2