Update to master version of rubocop and fix latest warnings