merging manually changes from fnichol/chef-rvm#186