Raw text for ZMTP-CURVE
Fixed link
Fixed merge conflict (where did that come from?)
Renamed ZMTP-PLAIN to PLAIN, ZMTP-CURVE to CURVE for simplicity
Merge pull request #14 from hintjens/master

Shortened mechanism names