Merge pull request #226 from mochi/otp-22

Update CHANGES and add OTP 21.3, 22 to travis matrix