Use a template, fixes bug with no comment, you dont need to move file anymore. Also removes existing file if existant
Merge pull request #1 from zond/jimmy/docile_template

Small refactor using template.