Merge in ECC and FF-DHE. Fixes #79. Fixes #73. Fixes #71. Fixes #78. Fix...

...es #57