Created CHANGELOG
Merge branch 'master' into will/jinja2-templates
Updated CHANGELOG