DS-1563:  Refactor UriMutator for clarity and cull some redundant code;  more could be done
Merge pull request #4 from inbloom/DS-1563

DS-1563:  Refactor UriMutator for clarity and cull some redundant code; ...