Merge remote-tracking branch 'mhs/pr/8'

Conflicts:
	lib/sms_spec/drivers/twilio-ruby.rb
	spec/drivers_spec.rb
Fixes matchers to respect RSpec 3.0