Storage options are now stored with their schemas

- This allows the options that created the schemas to be referenced
  for later use.
- The overloading of the storage schemas for aggregation schemas means
  this gets cargo culted along.
Added "spooling" to the version for internal pypy