Restore RFC 2616 compliance

You previously merged a change of mine to make the language selection match the rules in RFC 2616 but unfortunately I forgot to fix the tests and a subsequent change has broken the code again in order to make the tests pass.

This commit reverts the code and fixes the tests to correctly test that the RFC 2616 rules are followed.

A new gem release would also be nice.

Thanks,

Tom