Hashes in the blockchain, when necessary, and then markets which will sell you a file when presented with the hash. Storage technology can be whatever.
That's the smart plan, I think. I really want to take a crack at those storage markets in-browser, use a distributed hash table and WebRTC to pay people for leaving a browser open and allowing us to store stuff on their hard drives!