Added support for deploying to multiple providers
Merge branch 'master' into multiple_providers

Conflicts:
	lib/travis/build/script/addons/deploy.rb
	spec/script/addons/deploy_spec.rb
Fixed tests
Merge pull request #137 from Aaron1011/multiple_providers

Added support for deploying to multiple providers