Merge pull request #5 from myrle-krantz/develop

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