merge updates from bbatsov/ruby-style-guide from 097eeae to b68eded