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

...es #57
Indeed, but I think there was some idea we were going to reduce the list, not expand it.

I'm waiting for WG consensus on this.