Tolerate unpeppered models.
Merge remote-tracking branch 'origin/master' into handle_local_download

Get the aes_key vs. pepper handling onto this branch so I can use it in Jarvis.