Merging SJLangley's fixes

This supersedes https://github.com/twilio/twilio-php/pull/124