new jinja2._compat module for stuff not yet in six 1.3.0
stuff missing from previous commit, thanks git
Merge remote-tracking branch 'ThomasWaldmann/sprint-branch' into sprint-branch
Fixed a type in a module name.