Merge branch 'develop'
Also install the Jinja2 requirements
Seriously, spaces...
Merge branch 'master' into develop