Don't suggest NPN will be used when it might be ALPN.
Merge pull request #779 from square/adrian.remove-npn-tagging

Don't suggest NPN will be used when it might be ALPN