More code-signing madness

Looks like the merge build is failing on Travis CI, but
individual commits are passing. :(