Generate pre hook now generates with jinja2, removed generated templates, updated base templates with context
Merge remote-tracking branch 'origin/master'