Support the new RFC6891 EDNS0 SUBNET option code

Also keep support for the old draft code
Merge pull request #55 from abh/edns0-subnet-new-option-code

Support the new RFC6891 EDNS0 SUBNET option code