Merge pull request #3 from myrle-krantz/develop

Various changes to support key rotation with keys designated by timestamps.