Brett's latest + Tom's render_dotfile rewrite