Fixes after rebasing
Fixes after rebasing

bwhmather/cryptography,Lukasa/cryptography,sholsapp/cryptography,bwhmather/cryptography,Hasimir/cryptography,sholsapp/cryptography,sholsapp/cryptography,dstufft/cryptography,kimvais/cryptography,Ayrx/cryptography,Hasimir/cryptography,skeuomorf/cryptography,skeuomorf/cryptography,Lukasa/cryptography,sholsapp/cryptography,dstufft/cryptography,glyph/cryptography,kimvais/cryptography,dstufft/cryptography,Ayrx/cryptography,bwhmather/cryptography,dstufft/cryptography,dstufft/cryptography,skeuomorf/cryptography,kimvais/cryptography,glyph/cryptography,kimvais/cryptography,Hasimir/cryptography,Ayrx/cryptography,bwhmather/cryptography,skeuomorf/cryptography,Lukasa/cryptography,Hasimir/cryptography,Ayrx/cryptography