Address comments, remove lxml, set jinja version, new line at EOF