jinja2 _compat module with stuff missing from six 1.3.0

add a merge cs