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

Conflicts:
	cookbooks/rvm/attributes/default.rb
	cookbooks/windows/resources/reboot.rb
Import fnichol/chef-rvm version cb03855c647b865032544ee8c615ed7bde4f8b7f
Merge branch 'chef-vendor-rvm'
Import fnichol/chef-rvm version 7038fb8c518d0d7785767de215b1ae463f237973
Merge branch 'chef-vendor-rvm'
added rvm list