Merging up

Hey @kballard! I just finally rebased my rustcrypto onto rust HEAD, and I saw you did the same. This PR merges my work into yours and @randombit.