Brett's latest + Tom's render_dotfile rewrite
Merge pull request #2 from thomasjm/master

Brett's latest + Tom's render_dotfile rewrite