Merge pull request #3565 from ethomson/templates Handle dotfiles as the repo template dir and inside the template dir