more encodings and their equivalents
normalize encoding matchers
Merge pull request #772 from zendesk/grosser/more-encodings

Recognize more encodings and their equivalents