Merge pull request #8 from hpence/develop

Last bit of changes to BuildDestinationUri and its unit tests