2.1.0 -> 2.1.0
bundle update
try and fix  ree
try again...
update bundler
[VOICE-1310] add resource for voice address
Merge pull request #164 from zendesk/elaine/VOICE-1310_extract_addresses_controller

[VOICE-1310] add resource for voice address
Merge pull request #165 from zendesk/scott2211/uploadIO-filename

Pass filename param to UploadIO.new
Conflicts:
	.travis.yml
	Gemfile.lock
	zendesk_api.gemspec
always test activesupport