Fixed backwards compatability issues after TachyonURI went in
Merge pull request #483 from dcapwell/backwardscompatability

Fixed backwards compatability issues after TachyonURI went in