Import fnichol/chef-rvm version 7038fb8c518d0d7785767de215b1ae463f237973
Merge branch 'chef-vendor-rvm'

Conflicts:
	cookbooks/rvm/attributes/default.rb
	cookbooks/rvm/metadata.json
	cookbooks/rvm/metadata.rb