Ensure keys are sorted consistently

[marcqualie]

This will help with diffs if the keys always have the same order, regardless of how they're entered. This will allow adding new keys to go anywhere in the file and they will be normalized before encryption.