Fixed the repository paths back to tdebarochez
Added check for the new yacw 'uri' property
Merge branch 'add-yacw-uri-check'