consolidate ruby directories
Merge branch 'master' into ruby/2.1.0