Merge upstream

This is the latest 40ish commits that were added to bbatsovs style guide that have been added since we forked. There's nothing too interesting in here, mostly formatting of the style guide itself.

The exception being: https://github.com/intridea/ruby-style-guide/commit/b484901d3cbebc141885f958d143228256677ac0 where `next` is preferred in loops to a guard clause