[FIX] Requiring python-jinja2 for master as well (dox tests).
Merge branch 'hotfix/dox_nosetests' into fix/dox_notestests

Conflicts:
	.travis.yml