jinja2 inheretence is back, and cleaned up