Pulled in the lastest version of Rubocop for github master. Fixed all but three Rubocop infractions.