Fix up for openssl changes
Misc cleanup
Switch to servo's rust-url