Change to skip over nested git repositories.
Adding indicator for overwritten files.
Merge branch 'master' into jesterpm