Cleanup FileStorage

A set of cleanup changes, mainly to convince myself that it is thread safe and sufficiently robust...
how about:
`CHECK_NOTNULL(result);`
`CHECK(util::Read....);`
? 
That way you'd be able to tell what went wrong if it blew up.