Soft merge of uri branch
Clean up TachyonURI code
Address TODOs in TachyonURI
Merge pull request #384 from calvinjia/tachyon-14

[Tachyon-14] TachyonURI