cryptopp ecdh and ecies
Merge branch 'develop' into crypto
Merge pull request #379 from ethereum/crypto

CryptoPP ecdh and ecies
Merge remote-tracking branch 'upstream/develop' into develop
style fix