Merge pull request #61 from mpickering/wip/persist-virtual-file