configure rubocop
Merge branch 'rubocop'