Merge pull request #3 from myrle-krantz/develop

Various changes to support timestamp designated keys for key rotation.