Fix issue with UriBuilder creating Uris with extra cruft when certain parts were empty.
Merge pull request #17 from google/1_6

Fix issue with UriBuilder creating Uris with extra cruft when certain pa...