Syncing updates from Adafruit branch

https://github.com/adafruit/Adafruit_MPR121_Library/commit/6f33121d3ee11703daea38203aa9248352d22dbb