some jinja2 cleanup, update to new ansible conventions, etc