Import fnichol/chef-rvm version 4a408e5d6c5a52c37388a799c516430263339849
Merge branch 'chef-vendor-rvm'

Conflicts:
	cookbooks/apt/recipes/cacher-ng.rb
	cookbooks/build-essential/recipes/solaris2.rb
	cookbooks/nginx/recipes/http_ssl_module.rb
	cookbooks/rvm/.gitignore
	cookbooks/rvm/.travis.yml
	cookbooks/rvm/CHANGELOG.md
	cookbooks/rvm/README.md
	cookbooks/rvm/Rakefile
	cookbooks/rvm/attributes/default.rb
	cookbooks/rvm/libraries/chef_rvm_recipe_helpers.rb
	cookbooks/rvm/libraries/rvm_chef_user_environment.rb
	cookbooks/rvm/libraries/rvm_rubygems_package.rb
	cookbooks/rvm/libraries/rvm_shell_chef_wrapper.rb
	cookbooks/rvm/metadata.rb
	cookbooks/rvm/providers/ruby.rb
	cookbooks/rvm/recipes/system_install.rb
	cookbooks/rvm/recipes/user_install.rb
	cookbooks/rvm/templates/default/rvmrc.erb
	cookbooks/rvm/templates/default/vagrant-chef-client-wrapper.erb
	cookbooks/rvm/templates/default/vagrant-chef-solo-wrapper.erb
changed default ruby version