shellrc: Wrap svn only if svn and colordiff are both present. Don't hard code path.
"Flattened" the file structure.