automated changes made by running python-modernize jinja2
python 3 port - manual fixes

code works (no failing tests) on python 2.6, 2.7, 3.2 and 3.3

removed the 2to3 related code, including the custom_fixers

added myself as patch contributor